Skip to content

Commit bd9744d

Browse files
authored
Rollup merge of #135200 - jieyouxu:stabilize-style-edition, r=ytmimi,compiler-errors
rustfmt: drop nightly-gating of the `--style-edition` flag registration Follow-up to [Stabilize `style_edition = "2024"` in-tree #134929](#134929). #134929 un-nightly-gated the *read* of `--style-edition`, but didn't also un-nightly-gate the *registration*/*declaration* of the `--style-edition` flag itself. Reading `--style-edition` on a non-nightly channel (e.g. beta) will thus panic because `--style-edition` is never declared. This PR also un-nightly-gates the registration. Not sure how to write a regression test for this, because this *requires* the non-nightly / beta channel. Though existing tests do fail (albeit indirectly). Checking if this fixes the panic against beta in #135197. r? rustfmt
2 parents 847c1de + b77eb96 commit bd9744d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/tools/rustfmt/src/bin/main.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,12 @@ fn make_opts() -> Options {
161161
"Set options from command line. These settings take priority over .rustfmt.toml",
162162
"[key1=val1,key2=val2...]",
163163
);
164+
opts.optopt(
165+
"",
166+
"style-edition",
167+
"The edition of the Style Guide.",
168+
"[2015|2018|2021|2024]",
169+
);
164170

165171
if is_nightly {
166172
opts.optflag(
@@ -186,12 +192,6 @@ fn make_opts() -> Options {
186192
"skip-children",
187193
"Don't reformat child modules (unstable).",
188194
);
189-
opts.optopt(
190-
"",
191-
"style-edition",
192-
"The edition of the Style Guide (unstable).",
193-
"[2015|2018|2021|2024]",
194-
);
195195
}
196196

197197
opts.optflag("v", "verbose", "Print verbose output");

0 commit comments

Comments
 (0)