feat: implement 2024 Style Edition for expr overflows
This commit is contained in:
parent
0c6515cacc
commit
065258659d
9 changed files with 602 additions and 2 deletions
|
|
@ -915,4 +915,36 @@ mod test {
|
|||
let config = get_config(config_file, Some(options));
|
||||
assert_eq!(config.style_edition(), StyleEdition::Edition2021);
|
||||
}
|
||||
|
||||
#[nightly_only_test]
|
||||
#[test]
|
||||
fn correct_defaults_for_style_edition_loaded() {
|
||||
let mut options = GetOptsOptions::default();
|
||||
options.style_edition = Some(StyleEdition::Edition2024);
|
||||
let config = get_config(None, Some(options));
|
||||
assert_eq!(config.style_edition(), StyleEdition::Edition2024);
|
||||
assert_eq!(config.overflow_delimited_expr(), true);
|
||||
}
|
||||
|
||||
#[nightly_only_test]
|
||||
#[test]
|
||||
fn style_edition_defaults_overridden_from_config() {
|
||||
let options = GetOptsOptions::default();
|
||||
let config_file = Some(Path::new("tests/config/style-edition/overrides"));
|
||||
let config = get_config(config_file, Some(options));
|
||||
assert_eq!(config.style_edition(), StyleEdition::Edition2024);
|
||||
assert_eq!(config.overflow_delimited_expr(), false);
|
||||
}
|
||||
|
||||
#[nightly_only_test]
|
||||
#[test]
|
||||
fn style_edition_defaults_overridden_from_cli() {
|
||||
let mut options = GetOptsOptions::default();
|
||||
let config_file = Some(Path::new("tests/config/style-edition/just-style-edition"));
|
||||
options.inline_config =
|
||||
HashMap::from([("overflow_delimited_expr".to_owned(), "false".to_owned())]);
|
||||
let config = get_config(config_file, Some(options));
|
||||
assert_eq!(config.style_edition(), StyleEdition::Edition2024);
|
||||
assert_eq!(config.overflow_delimited_expr(), false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -828,7 +828,7 @@ binop_separator = "Front"
|
|||
remove_nested_parens = true
|
||||
combine_control_expr = true
|
||||
short_array_element_width_threshold = 10
|
||||
overflow_delimited_expr = false
|
||||
overflow_delimited_expr = true
|
||||
struct_field_align_threshold = 0
|
||||
enum_discrim_align_threshold = 0
|
||||
match_arm_blocks = true
|
||||
|
|
|
|||
|
|
@ -627,7 +627,7 @@ config_option_with_style_edition_default!(
|
|||
RemoveNestedParens, bool, _ => true;
|
||||
CombineControlExpr, bool, _ => true;
|
||||
ShortArrayElementWidthThreshold, usize, _ => 10;
|
||||
OverflowDelimitedExpr, bool, _ => false;
|
||||
OverflowDelimitedExpr, bool, Edition2024 => true, _ => false;
|
||||
StructFieldAlignThreshold, usize, _ => 0;
|
||||
EnumDiscrimAlignThreshold, usize, _ => 0;
|
||||
MatchArmBlocks, bool, _ => true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue