Skip to content

Commit 4579a63

Browse files
calebcartwrightcalebcartwright
committed
feat: implement 2024 Style Edition for expr overflows
1 parent 676b64b commit 4579a63

File tree

9 files changed

+602
-2
lines changed

9 files changed

+602
-2
lines changed

‎rustfmt.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
error_on_line_overflow = true
22
error_on_unformatted = true
33
style_edition = "2024"
4+
overflow_delimited_expr = false

‎src/bin/main.rs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,4 +914,36 @@ mod test {
914914
let config = get_config(config_file, Some(options));
915915
assert_eq!(config.style_edition(), StyleEdition::Edition2021);
916916
}
917+
918+
#[nightly_only_test]
919+
#[test]
920+
fn correct_defaults_for_style_edition_loaded() {
921+
let mut options = GetOptsOptions::default();
922+
options.style_edition = Some(StyleEdition::Edition2024);
923+
let config = get_config(None, Some(options));
924+
assert_eq!(config.style_edition(), StyleEdition::Edition2024);
925+
assert_eq!(config.overflow_delimited_expr(), true);
926+
}
927+
928+
#[nightly_only_test]
929+
#[test]
930+
fn style_edition_defaults_overridden_from_config() {
931+
let options = GetOptsOptions::default();
932+
let config_file = Some(Path::new("tests/config/style-edition/overrides"));
933+
let config = get_config(config_file, Some(options));
934+
assert_eq!(config.style_edition(), StyleEdition::Edition2024);
935+
assert_eq!(config.overflow_delimited_expr(), false);
936+
}
937+
938+
#[nightly_only_test]
939+
#[test]
940+
fn style_edition_defaults_overridden_from_cli() {
941+
let mut options = GetOptsOptions::default();
942+
let config_file = Some(Path::new("tests/config/style-edition/just-style-edition"));
943+
options.inline_config =
944+
HashMap::from([("overflow_delimited_expr".to_owned(), "false".to_owned())]);
945+
let config = get_config(config_file, Some(options));
946+
assert_eq!(config.style_edition(), StyleEdition::Edition2024);
947+
assert_eq!(config.overflow_delimited_expr(), false);
948+
}
917949
}

‎src/config/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ binop_separator = "Front"
824824
remove_nested_parens = true
825825
combine_control_expr = true
826826
short_array_element_width_threshold = 10
827-
overflow_delimited_expr = false
827+
overflow_delimited_expr = true
828828
struct_field_align_threshold = 0
829829
enum_discrim_align_threshold = 0
830830
match_arm_blocks = true

‎src/config/options.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ config_option_with_style_edition_default!(
624624
RemoveNestedParens, bool, _ => true;
625625
CombineControlExpr, bool, _ => true;
626626
ShortArrayElementWidthThreshold, usize, _ => 10;
627-
OverflowDelimitedExpr, bool, _ => false;
627+
OverflowDelimitedExpr, bool, Edition2024 => true, _ => false;
628628
StructFieldAlignThreshold, usize, _ => 0;
629629
EnumDiscrimAlignThreshold, usize, _ => 0;
630630
MatchArmBlocks, bool, _ => true;

‎tests/config/style-edition/overrides/rustfmt.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
style_edition = "2024"
2+
overflow_delimited_expr = false

‎tests/source/configs/style_edition/overflow_delim_expr_2015.rs

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
// rustfmt-style_edition: 2015
2+
3+
fn combine_blocklike() {
4+
do_thing(
5+
|param| {
6+
action();
7+
foo(param)
8+
},
9+
);
10+
11+
do_thing(
12+
x,
13+
|param| {
14+
action();
15+
foo(param)
16+
},
17+
);
18+
19+
do_thing(
20+
x,
21+
22+
// I'll be discussing the `action` with your para(m)legal counsel
23+
|param| {
24+
action();
25+
foo(param)
26+
},
27+
);
28+
29+
do_thing(
30+
Bar {
31+
x: value,
32+
y: value2,
33+
},
34+
);
35+
36+
do_thing(
37+
x,
38+
Bar {
39+
x: value,
40+
y: value2,
41+
},
42+
);
43+
44+
do_thing(
45+
x,
46+
47+
// Let me tell you about that one time at the `Bar`
48+
Bar {
49+
x: value,
50+
y: value2,
51+
},
52+
);
53+
54+
do_thing(
55+
&[
56+
value_with_longer_name,
57+
value2_with_longer_name,
58+
value3_with_longer_name,
59+
value4_with_longer_name,
60+
],
61+
);
62+
63+
do_thing(
64+
x,
65+
&[
66+
value_with_longer_name,
67+
value2_with_longer_name,
68+
value3_with_longer_name,
69+
value4_with_longer_name,
70+
],
71+
);
72+
73+
do_thing(
74+
x,
75+
76+
// Just admit it; my list is longer than can be folded on to one line
77+
&[
78+
value_with_longer_name,
79+
value2_with_longer_name,
80+
value3_with_longer_name,
81+
value4_with_longer_name,
82+
],
83+
);
84+
85+
do_thing(
86+
vec![
87+
value_with_longer_name,
88+
value2_with_longer_name,
89+
value3_with_longer_name,
90+
value4_with_longer_name,
91+
],
92+
);
93+
94+
do_thing(
95+
x,
96+
vec![
97+
value_with_longer_name,
98+
value2_with_longer_name,
99+
value3_with_longer_name,
100+
value4_with_longer_name,
101+
],
102+
);
103+
104+
do_thing(
105+
x,
106+
107+
// Just admit it; my list is longer than can be folded on to one line
108+
vec![
109+
value_with_longer_name,
110+
value2_with_longer_name,
111+
value3_with_longer_name,
112+
value4_with_longer_name,
113+
],
114+
);
115+
116+
do_thing(
117+
x,
118+
(
119+
1,
120+
2,
121+
3,
122+
|param| {
123+
action();
124+
foo(param)
125+
},
126+
),
127+
);
128+
}
129+
130+
fn combine_struct_sample() {
131+
let identity = verify(
132+
&ctx,
133+
VerifyLogin {
134+
type_: LoginType::Username,
135+
username: args.username.clone(),
136+
password: Some(args.password.clone()),
137+
domain: None,
138+
},
139+
)?;
140+
}
141+
142+
fn combine_macro_sample() {
143+
rocket::ignite()
144+
.mount(
145+
"/",
146+
routes![
147+
http::auth::login,
148+
http::auth::logout,
149+
http::cors::options,
150+
http::action::dance,
151+
http::action::sleep,
152+
],
153+
)
154+
.launch();
155+
}

‎tests/source/configs/style_edition/overflow_delim_expr_2024.rs

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
// rustfmt-style_edition: 2024
2+
3+
fn combine_blocklike() {
4+
do_thing(
5+
|param| {
6+
action();
7+
foo(param)
8+
},
9+
);
10+
11+
do_thing(
12+
x,
13+
|param| {
14+
action();
15+
foo(param)
16+
},
17+
);
18+
19+
do_thing(
20+
x,
21+
22+
// I'll be discussing the `action` with your para(m)legal counsel
23+
|param| {
24+
action();
25+
foo(param)
26+
},
27+
);
28+
29+
do_thing(
30+
Bar {
31+
x: value,
32+
y: value2,
33+
},
34+
);
35+
36+
do_thing(
37+
x,
38+
Bar {
39+
x: value,
40+
y: value2,
41+
},
42+
);
43+
44+
do_thing(
45+
x,
46+
47+
// Let me tell you about that one time at the `Bar`
48+
Bar {
49+
x: value,
50+
y: value2,
51+
},
52+
);
53+
54+
do_thing(
55+
&[
56+
value_with_longer_name,
57+
value2_with_longer_name,
58+
value3_with_longer_name,
59+
value4_with_longer_name,
60+
],
61+
);
62+
63+
do_thing(
64+
x,
65+
&[
66+
value_with_longer_name,
67+
value2_with_longer_name,
68+
value3_with_longer_name,
69+
value4_with_longer_name,
70+
],
71+
);
72+
73+
do_thing(
74+
x,
75+
76+
// Just admit it; my list is longer than can be folded on to one line
77+
&[
78+
value_with_longer_name,
79+
value2_with_longer_name,
80+
value3_with_longer_name,
81+
value4_with_longer_name,
82+
],
83+
);
84+
85+
do_thing(
86+
vec![
87+
value_with_longer_name,
88+
value2_with_longer_name,
89+
value3_with_longer_name,
90+
value4_with_longer_name,
91+
],
92+
);
93+
94+
do_thing(
95+
x,
96+
vec![
97+
value_with_longer_name,
98+
value2_with_longer_name,
99+
value3_with_longer_name,
100+
value4_with_longer_name,
101+
],
102+
);
103+
104+
do_thing(
105+
x,
106+
107+
// Just admit it; my list is longer than can be folded on to one line
108+
vec![
109+
value_with_longer_name,
110+
value2_with_longer_name,
111+
value3_with_longer_name,
112+
value4_with_longer_name,
113+
],
114+
);
115+
116+
do_thing(
117+
x,
118+
(
119+
1,
120+
2,
121+
3,
122+
|param| {
123+
action();
124+
foo(param)
125+
},
126+
),
127+
);
128+
}
129+
130+
fn combine_struct_sample() {
131+
let identity = verify(
132+
&ctx,
133+
VerifyLogin {
134+
type_: LoginType::Username,
135+
username: args.username.clone(),
136+
password: Some(args.password.clone()),
137+
domain: None,
138+
},
139+
)?;
140+
}
141+
142+
fn combine_macro_sample() {
143+
rocket::ignite()
144+
.mount(
145+
"/",
146+
routes![
147+
http::auth::login,
148+
http::auth::logout,
149+
http::cors::options,
150+
http::action::dance,
151+
http::action::sleep,
152+
],
153+
)
154+
.launch();
155+
}

0 commit comments

Comments
 (0)