Skip to content
This repository has been archived by the owner on Sep 4, 2024. It is now read-only.

Delete .rustfmt.toml #117

Merged
merged 2 commits into from
Jun 12, 2024
Merged

Conversation

tcharding
Copy link
Collaborator

@tcharding tcharding commented May 5, 2024

In commit 14429b13 I introduced a new config file for rustfmt but did not delete the hidden .rustfmt.toml so the new file had no effect.

  • Delete the old confid .rustfmt.toml
  • Make rustfmt.toml mirror the current one in rust-bitcoin with the exception of edition = 2018
  • Run cargo +nightly fmt

Fix: #116

@tcharding
Copy link
Collaborator Author

Thought this would be quick and easy, draft till I get to fixing it up.

@tcharding tcharding marked this pull request as draft May 5, 2024 23:12
@apoelstra
Copy link
Owner

Thanks for taking it on! Concept ACK.

@tcharding tcharding marked this pull request as ready for review May 17, 2024 04:38
@tcharding tcharding marked this pull request as draft May 31, 2024 02:09
@tcharding tcharding force-pushed the 05-06-rustfmt-config branch 2 times, most recently from 8d361ca to e80bd94 Compare May 31, 2024 19:14
We are on Rust 1.48 here now, fix typo in README.
@tcharding tcharding marked this pull request as ready for review June 12, 2024 02:06
In commit `14429b13` I introduced a new config file for rustfmt but
did not delete the hidden `.rustfmt.toml` so the new file had no effect.

- Delete the old confid `.rustfmt.toml`

- Make `rustfmt.toml` mirror the current one in `rust-bitcoin` with the
  exception of `edition = 2018`

- Run `cargo +nightly fmt`

Fix: apoelstra#116
Copy link
Owner

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 6663bca

@apoelstra apoelstra merged commit 13d21e5 into apoelstra:master Jun 12, 2024
6 checks passed
@tcharding tcharding deleted the 05-06-rustfmt-config branch August 8, 2024 04:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use either rustfmt.toml or .rustfmt.toml but not both
2 participants