bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stabilize style_edition 2024 in-tree

Browse source
This commit is contained in:
Michael Goulet 2024-12-30 17:06:44 +00:00
parent f95c996750
commit f694db1e28
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tools/rustfmt/src/bin/main.rs
View file

@ -568,10 +568,6 @@ impl GetOptsOptions {
if let Some(ref file_lines) = matches.opt_str("file-lines") {
options.file_lines = file_lines.parse()?;
}
if let Some(ref edition_str) = matches.opt_str("style-edition") {
options.style_edition =
Some(style_edition_from_style_edition_str(edition_str)?);
}
} else {
let mut unstable_options = vec![];
if matches.opt_present("skip-children") {
@ -583,9 +579,6 @@ impl GetOptsOptions {
if matches.opt_present("file-lines") {
unstable_options.push("`--file-lines`");
}
if matches.opt_present("style-edition") {
unstable_options.push("`--style-edition`");
}
if !unstable_options.is_empty() {
let s = if unstable_options.len() == 1 { "" } else { "s" };
return Err(format_err!(
@ -661,6 +654,10 @@ impl GetOptsOptions {
}
}
if let Some(ref edition_str) = matches.opt_str("style-edition") {
options.style_edition = Some(style_edition_from_style_edition_str(edition_str)?);
}
Ok(options)
}

4
src/tools/rustfmt/src/config/mod.rs
View file

@ -29,7 +29,7 @@ pub(crate) mod style_edition;
// This macro defines configuration options used in rustfmt. Each option
// is defined as follows:
//
// `name: value type, default value, is stable, description;`
// `name: value type, is stable, description;`
create_config! {
// Fundamental stuff
max_width: MaxWidth, true, "Maximum width of each line";
@ -149,7 +149,7 @@ create_config! {
blank_lines_lower_bound: BlankLinesLowerBound, false,
"Minimum number of blank lines which must be put between items";
edition: EditionConfig, true, "The edition of the parser (RFC 2052)";
style_edition: StyleEditionConfig, false, "The edition of the Style Guide (RFC 3338)";
style_edition: StyleEditionConfig, true, "The edition of the Style Guide (RFC 3338)";
version: VersionConfig, false, "Version of formatting rules";
inline_attribute_width: InlineAttributeWidth, false,
"Write an item and its attribute on the same line \

1
src/tools/rustfmt/src/config/options.rs
View file

@ -511,7 +511,6 @@ pub enum StyleEdition {
Edition2021,
#[value = "2024"]
#[doc_hint = "2024"]
#[unstable_variant]
/// [Edition 2024]().
Edition2024,
}