My code needs two passes to be formatted correctly

[msrd0]

When making the following change from https://github.com/msrd0/gotham_restful/tree/5181b4b448003a06e01d50609371a9578db9d067, rustfmt _{^{(rustfmt 1.4.38-nightly (5e57faa 2022-01-19))}} needs two passes to correctly format the code:

My Change:

$ git diff src/openapi/router.rs |cat
diff --git a/src/openapi/router.rs b/src/openapi/router.rs
index dbcecb8a5..ec5fdcc21 100644
--- a/src/openapi/router.rs
+++ b/src/openapi/router.rs
@@ -137,8 +137,7 @@ macro_rules! implOpenapiRouter {
 					Method::PATCH => item.patch = Some(op),
 					Method::TRACE => item.trace = Some(op),
 					method => warn!(
-						"Ignoring unsupported method '{}' in OpenAPI Specification",
-						method
+						"Ignoring unsupported method '{method}' in OpenAPI Specification"
 					)
 				};
 				(self.0).openapi_builder.add_path(path, item);

First Pass of rustfmt:

$ git diff src/openapi/router.rs |cat
diff --git a/src/openapi/router.rs b/src/openapi/router.rs
index dbcecb8a5..e81e0640f 100644
--- a/src/openapi/router.rs
+++ b/src/openapi/router.rs
@@ -136,10 +136,9 @@ macro_rules! implOpenapiRouter {
 					Method::HEAD => item.head = Some(op),
 					Method::PATCH => item.patch = Some(op),
 					Method::TRACE => item.trace = Some(op),
-					method => warn!(
-						"Ignoring unsupported method '{}' in OpenAPI Specification",
-						method
-					)
+					method => {
+						warn!("Ignoring unsupported method '{method}' in OpenAPI Specification")
+					},
 				};
 				(self.0).openapi_builder.add_path(path, item);
 

Second Pass of rustfmt:

$ git diff src/openapi/router.rs |cat
diff --git a/src/openapi/router.rs b/src/openapi/router.rs
index dbcecb8a5..33937d612 100644
--- a/src/openapi/router.rs
+++ b/src/openapi/router.rs
@@ -136,10 +136,9 @@ macro_rules! implOpenapiRouter {
 					Method::HEAD => item.head = Some(op),
 					Method::PATCH => item.patch = Some(op),
 					Method::TRACE => item.trace = Some(op),
-					method => warn!(
-						"Ignoring unsupported method '{}' in OpenAPI Specification",
-						method
-					)
+					method => {
+						warn!("Ignoring unsupported method '{method}' in OpenAPI Specification")
+					}
 				};
 				(self.0).openapi_builder.add_path(path, item);
 

Notice the }, was changed to } in the second pass.

[calebcartwright]

Idempotency issues are indeed a problem, so thank you for sharing! Would you mind doing me a favor and making some changes to the description? There's a lot of moving parts that actually make it less clear than it could be.

The first ask would be to distill down to a complete, minimal repro that can be copy/pasted and used directly. The diff based output tools like git and rustfmt's --check provide are useful for a human working locally with code, but they add unnecessary noise and invalid characters to issue snippets that always have to be manually trimmed out during triage.

Secondly, please make sure the repro case is against a clean state so that we don't have manual, non-formatting changes intermingled with rustfmt runs.

Finally, can you confirm you're running with the default config, or if not, share your rustfmt config file contents?

[msrd0]

I'm running with the config from the git tree I linked above - https://github.com/msrd0/gotham_restful/blob/5181b4b448003a06e01d50609371a9578db9d067/rustfmt.toml

If I find some time, I'll try to create a minimal example that reproduces the issue.

[calebcartwright]

I'm running with the config from the git tree I linked above - https://github.com/msrd0/gotham_restful/blob/5181b4b448003a06e01d50609371a9578db9d067/rustfmt.toml

The rationale for including as much relevant information in the issue is possible is that it makes it easier to see and discuss without everyone having to follow links, clone, etc. Please take a look when you can, as this doesn't yet clear the threshold for being actionable

[msrd0]

This is a very small example that reproduces the problem:

edition = "2021"
max_width = 90
match_block_trailing_comma = true
trailing_comma = "Never"

enum FooBar {
    Foo,
    Bar
}

fn main() {
    match FooBar::Foo {
        FooBar::Foo => unreachable!(),
        FooBar::Bar => println!(
            "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
        )
    }
}

On the first pass, rustfmt reformats the println as a one line statement but adds an extra comma at the end, which gets removed in the second pass:

enum FooBar {
    Foo,
    Bar
}

fn main() {
    match FooBar::Foo {
        FooBar::Foo => unreachable!(),
        FooBar::Bar => {
            println!("Lorem ipsum dolor sit amet, consectetuer adipiscing elit.")
        },
    }
}

enum FooBar {
    Foo,
    Bar
}

fn main() {
    match FooBar::Foo {
        FooBar::Foo => unreachable!(),
        FooBar::Bar => {
            println!("Lorem ipsum dolor sit amet, consectetuer adipiscing elit.")
        }
    }
}

[calebcartwright]

Thanks! I'm fairly confident this is a duplicate report but will leave open for now since my github search skills are failing me and I want to make sure we don't lose track of this

[ytmimi]

I don't know if I'm doing something wrong, but right now I'm unable to reproduce the behavior given the mcve. I'm using rustfmt 1.4.38-nightly (5c558e2c 2022-01-23), and can't get the 2nd match arm to be wrapped in a block when I run rustfmt on the input.

I've added the mcve to a file named issue_5193.rs, and the given configuration to a file named 5193-rustfmt.toml.
I'm running the following command:

cargo run --bin rustfmt -- --check config-path=5193-rustfmt.toml issue_5193.rs

[msrd0]

@ytmimi When I run rustfmt +nightly --check --config-path=5193-rustfmt.toml issue_5193.rs I can reproduce the issue with both the version I used initially (rustfmt 1.4.38-nightly (5e57faa 2022-01-19)) and the latest one available from rustup (rustfmt 1.4.38-nightly (e0a55f4 2022-01-28)).

Maybe you need to add a double dash (--) in front of the config-path argument?

[ytmimi]

whoops 😅, you're right I wasn't passing the --config-path correctly.