Skip to content

Commit 52de203

Browse files
KijewskiKijewski
committed
Don't format with overflow_delimited_expr
The default value for `overflow_delimited_expr = true` was reverted to `false`: [rust-lang/rust#136312]. [rust-lang/rust#136312]: https://redirect.github.com/rust-lang/rust/pull/136312
1 parent c496c0b commit 52de203

File tree

6 files changed

+155
-94
lines changed

6 files changed

+155
-94
lines changed

‎.rustfmt.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ group_imports = "StdExternalCrate"
33
imports_granularity = "Module"
44
newline_style = "Unix"
55
normalize_comments = true
6-
overflow_delimited_expr = true
76
style_edition = "2024"
87
unstable_features = true
98
use_field_init_shorthand = true

‎rinja/src/helpers.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,14 @@ where
4444
#[inline]
4545
fn next(&mut self) -> Option<(<I as Iterator>::Item, LoopItem)> {
4646
self.iter.next().map(|(index, item)| {
47-
(item, LoopItem {
48-
index,
49-
first: index == 0,
50-
last: self.iter.peek().is_none(),
51-
})
47+
(
48+
item,
49+
LoopItem {
50+
index,
51+
first: index == 0,
52+
last: self.iter.peek().is_none(),
53+
},
54+
)
5255
})
5356
}
5457
}

‎rinja_derive/src/config.rs

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -645,19 +645,22 @@ mod tests {
645645
None,
646646
)
647647
.unwrap();
648-
assert_eq!(config.escapers, vec![
649-
(str_set(&["js"]), "::my_filters::Js".into()),
650-
(
651-
str_set(&[
652-
"askama", "html", "htm", "j2", "jinja", "jinja2", "rinja", "svg", "xml"
653-
]),
654-
"rinja::filters::Html".into()
655-
),
656-
(
657-
str_set(&["md", "none", "txt", "yml", ""]),
658-
"rinja::filters::Text".into()
659-
),
660-
]);
648+
assert_eq!(
649+
config.escapers,
650+
vec![
651+
(str_set(&["js"]), "::my_filters::Js".into()),
652+
(
653+
str_set(&[
654+
"askama", "html", "htm", "j2", "jinja", "jinja2", "rinja", "svg", "xml"
655+
]),
656+
"rinja::filters::Html".into()
657+
),
658+
(
659+
str_set(&["md", "none", "txt", "yml", ""]),
660+
"rinja::filters::Text".into()
661+
),
662+
]
663+
);
661664
}
662665

663666
#[cfg(feature = "config")]

‎rinja_derive/src/lib.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,14 @@ impl fmt::Display for FileInfo<'_> {
441441
source_after = error_info.source_after,
442442
)
443443
} else {
444-
write!(f, "\n --> {}", match std::env::current_dir() {
445-
Ok(cwd) => fmt_left!(move "{}", strip_common(&cwd, self.path)),
446-
Err(_) => fmt_right!("{}", self.path.display()),
447-
})
444+
write!(
445+
f,
446+
"\n --> {}",
447+
match std::env::current_dir() {
448+
Ok(cwd) => fmt_left!(move "{}", strip_common(&cwd, self.path)),
449+
Err(_) => fmt_right!("{}", self.path.display()),
450+
}
451+
)
448452
}
449453
}
450454
}

‎rinja_parser/src/lib.rs

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,10 +1417,13 @@ mod test {
14171417
// Check with `b` prefix.
14181418
assert_eq!(
14191419
char_lit.parse_peek("b'a'").unwrap(),
1420-
("", crate::CharLit {
1421-
prefix: Some(crate::CharPrefix::Binary),
1422-
content: "a"
1423-
})
1420+
(
1421+
"",
1422+
crate::CharLit {
1423+
prefix: Some(crate::CharPrefix::Binary),
1424+
content: "a"
1425+
}
1426+
)
14241427
);
14251428

14261429
// Should fail.
@@ -1438,17 +1441,23 @@ mod test {
14381441
fn test_str_lit() {
14391442
assert_eq!(
14401443
str_lit.parse_peek(r#"b"hello""#).unwrap(),
1441-
("", StrLit {
1442-
prefix: Some(StrPrefix::Binary),
1443-
content: "hello"
1444-
})
1444+
(
1445+
"",
1446+
StrLit {
1447+
prefix: Some(StrPrefix::Binary),
1448+
content: "hello"
1449+
}
1450+
)
14451451
);
14461452
assert_eq!(
14471453
str_lit.parse_peek(r#"c"hello""#).unwrap(),
1448-
("", StrLit {
1449-
prefix: Some(StrPrefix::CLike),
1450-
content: "hello"
1451-
})
1454+
(
1455+
"",
1456+
StrLit {
1457+
prefix: Some(StrPrefix::CLike),
1458+
content: "hello"
1459+
}
1460+
)
14521461
);
14531462
assert!(str_lit.parse_peek(r#"d"hello""#).is_err());
14541463
}

‎rinja_parser/src/tests.rs

Lines changed: 102 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,13 @@ fn test_parse_numbers() {
121121
fn test_parse_var() {
122122
let s = Syntax::default();
123123

124-
assert_eq!(Ast::from_str("{{ foo }}", None, &s).unwrap().nodes, vec![
125-
Node::Expr(Ws(None, None), WithSpan::no_span(Expr::Var("foo")))
126-
]);
124+
assert_eq!(
125+
Ast::from_str("{{ foo }}", None, &s).unwrap().nodes,
126+
vec![Node::Expr(
127+
Ws(None, None),
128+
WithSpan::no_span(Expr::Var("foo"))
129+
)]
130+
);
127131
assert_eq!(
128132
Ast::from_str("{{ foo_bar }}", None, &s).unwrap().nodes,
129133
vec![Node::Expr(
@@ -132,18 +136,26 @@ fn test_parse_var() {
132136
)],
133137
);
134138

135-
assert_eq!(Ast::from_str("{{ none }}", None, &s).unwrap().nodes, vec![
136-
Node::Expr(Ws(None, None), WithSpan::no_span(Expr::Var("none")))
137-
]);
139+
assert_eq!(
140+
Ast::from_str("{{ none }}", None, &s).unwrap().nodes,
141+
vec![Node::Expr(
142+
Ws(None, None),
143+
WithSpan::no_span(Expr::Var("none"))
144+
)]
145+
);
138146
}
139147

140148
#[test]
141149
fn test_parse_const() {
142150
let s = Syntax::default();
143151

144-
assert_eq!(Ast::from_str("{{ FOO }}", None, &s).unwrap().nodes, vec![
145-
Node::Expr(Ws(None, None), WithSpan::no_span(Expr::Path(vec!["FOO"])))
146-
]);
152+
assert_eq!(
153+
Ast::from_str("{{ FOO }}", None, &s).unwrap().nodes,
154+
vec![Node::Expr(
155+
Ws(None, None),
156+
WithSpan::no_span(Expr::Path(vec!["FOO"]))
157+
)]
158+
);
147159
assert_eq!(
148160
Ast::from_str("{{ FOO_BAR }}", None, &s).unwrap().nodes,
149161
vec![Node::Expr(
@@ -152,18 +164,26 @@ fn test_parse_const() {
152164
)],
153165
);
154166

155-
assert_eq!(Ast::from_str("{{ NONE }}", None, &s).unwrap().nodes, vec![
156-
Node::Expr(Ws(None, None), WithSpan::no_span(Expr::Path(vec!["NONE"])))
157-
]);
167+
assert_eq!(
168+
Ast::from_str("{{ NONE }}", None, &s).unwrap().nodes,
169+
vec![Node::Expr(
170+
Ws(None, None),
171+
WithSpan::no_span(Expr::Path(vec!["NONE"]))
172+
)]
173+
);
158174
}
159175

160176
#[test]
161177
fn test_parse_path() {
162178
let s = Syntax::default();
163179

164-
assert_eq!(Ast::from_str("{{ None }}", None, &s).unwrap().nodes, vec![
165-
Node::Expr(Ws(None, None), WithSpan::no_span(Expr::Path(vec!["None"])))
166-
]);
180+
assert_eq!(
181+
Ast::from_str("{{ None }}", None, &s).unwrap().nodes,
182+
vec![Node::Expr(
183+
Ws(None, None),
184+
WithSpan::no_span(Expr::Path(vec!["None"]))
185+
)]
186+
);
167187
assert_eq!(
168188
Ast::from_str("{{ Some(123) }}", None, &s).unwrap().nodes,
169189
vec![Node::Expr(
@@ -325,36 +345,41 @@ fn test_rust_macro() {
325345
WithSpan::no_span(Expr::RustMacro(vec!["alloc", "vec"], "1, 2, 3")),
326346
)],
327347
);
328-
assert_eq!(Ast::from_str("{{a!()}}", None, &syntax).unwrap().nodes, [
329-
Node::Expr(
348+
assert_eq!(
349+
Ast::from_str("{{a!()}}", None, &syntax).unwrap().nodes,
350+
[Node::Expr(
330351
Ws(None, None),
331352
WithSpan::no_span(Expr::RustMacro(vec!["a"], ""))
332-
)
333-
]);
334-
assert_eq!(Ast::from_str("{{a !()}}", None, &syntax).unwrap().nodes, [
335-
Node::Expr(
353+
)]
354+
);
355+
assert_eq!(
356+
Ast::from_str("{{a !()}}", None, &syntax).unwrap().nodes,
357+
[Node::Expr(
336358
Ws(None, None),
337359
WithSpan::no_span(Expr::RustMacro(vec!["a"], ""))
338-
)
339-
]);
340-
assert_eq!(Ast::from_str("{{a! ()}}", None, &syntax).unwrap().nodes, [
341-
Node::Expr(
360+
)]
361+
);
362+
assert_eq!(
363+
Ast::from_str("{{a! ()}}", None, &syntax).unwrap().nodes,
364+
[Node::Expr(
342365
Ws(None, None),
343366
WithSpan::no_span(Expr::RustMacro(vec!["a"], ""))
344-
)
345-
]);
346-
assert_eq!(Ast::from_str("{{a ! ()}}", None, &syntax).unwrap().nodes, [
347-
Node::Expr(
367+
)]
368+
);
369+
assert_eq!(
370+
Ast::from_str("{{a ! ()}}", None, &syntax).unwrap().nodes,
371+
[Node::Expr(
348372
Ws(None, None),
349373
WithSpan::no_span(Expr::RustMacro(vec!["a"], ""))
350-
)
351-
]);
352-
assert_eq!(Ast::from_str("{{A!()}}", None, &syntax).unwrap().nodes, [
353-
Node::Expr(
374+
)]
375+
);
376+
assert_eq!(
377+
Ast::from_str("{{A!()}}", None, &syntax).unwrap().nodes,
378+
[Node::Expr(
354379
Ws(None, None),
355380
WithSpan::no_span(Expr::RustMacro(vec!["A"], ""))
356-
)
357-
]);
381+
)]
382+
);
358383
assert_eq!(
359384
&*Ast::from_str("{{a.b.c!( hello )}}", None, &syntax)
360385
.unwrap_err()
@@ -1103,30 +1128,48 @@ fn fuzzed_excessive_syntax_lengths() {
11031128
Some("\0]***NEWFILE\u{1f}***:7/v/.-3/\u{1b}/~~~~z~0/*:7/v/./t/t/.p//NEWVILE**::7/v");
11041129

11051130
for (kind, syntax_builder) in [
1106-
("opening block", SyntaxBuilder {
1107-
block_start: LONG_DELIM,
1108-
..SyntaxBuilder::default()
1109-
}),
1110-
("closing block", SyntaxBuilder {
1111-
block_end: LONG_DELIM,
1112-
..SyntaxBuilder::default()
1113-
}),
1114-
("opening expression", SyntaxBuilder {
1115-
expr_start: LONG_DELIM,
1116-
..SyntaxBuilder::default()
1117-
}),
1118-
("closing expression", SyntaxBuilder {
1119-
expr_end: LONG_DELIM,
1120-
..SyntaxBuilder::default()
1121-
}),
1122-
("opening comment", SyntaxBuilder {
1123-
comment_start: LONG_DELIM,
1124-
..SyntaxBuilder::default()
1125-
}),
1126-
("closing comment", SyntaxBuilder {
1127-
comment_end: LONG_DELIM,
1128-
..SyntaxBuilder::default()
1129-
}),
1131+
(
1132+
"opening block",
1133+
SyntaxBuilder {
1134+
block_start: LONG_DELIM,
1135+
..SyntaxBuilder::default()
1136+
},
1137+
),
1138+
(
1139+
"closing block",
1140+
SyntaxBuilder {
1141+
block_end: LONG_DELIM,
1142+
..SyntaxBuilder::default()
1143+
},
1144+
),
1145+
(
1146+
"opening expression",
1147+
SyntaxBuilder {
1148+
expr_start: LONG_DELIM,
1149+
..SyntaxBuilder::default()
1150+
},
1151+
),
1152+
(
1153+
"closing expression",
1154+
SyntaxBuilder {
1155+
expr_end: LONG_DELIM,
1156+
..SyntaxBuilder::default()
1157+
},
1158+
),
1159+
(
1160+
"opening comment",
1161+
SyntaxBuilder {
1162+
comment_start: LONG_DELIM,
1163+
..SyntaxBuilder::default()
1164+
},
1165+
),
1166+
(
1167+
"closing comment",
1168+
SyntaxBuilder {
1169+
comment_end: LONG_DELIM,
1170+
..SyntaxBuilder::default()
1171+
},
1172+
),
11301173
] {
11311174
let err = syntax_builder.to_syntax().unwrap_err();
11321175
assert_eq!(

0 commit comments

Comments
 (0)