Skip to content

Commit fe564c1

Browse files
authored
Rollup merge of #127607 - Zalathar:normalize-hint, r=wesleywiser
compiletest: Better error message for bad `normalize-*` headers Follow-up to #126777. Example of the new error message in context: ```text ---- [ui] tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.rs stdout ---- thread '[ui] tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.rs' panicked at src/tools/compiletest/src/header.rs:1001:13: couldn't parse custom normalization rule: `normalize-stderr-test ".*note: .*\n\n" -> ""` help: expected syntax is: `normalize-stderr-test: "REGEX" -> "REPLACEMENT"` note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace ```
2 parents 83d1a1b + 08a2992 commit fe564c1

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

src/tools/compiletest/src/header.rs

+12-6
Original file line numberDiff line numberDiff line change
@@ -991,13 +991,19 @@ impl Config {
991991
}
992992

993993
fn parse_custom_normalization(&self, line: &str, prefix: &str) -> Option<(String, String)> {
994-
if parse_cfg_name_directive(self, line, prefix).outcome == MatchOutcome::Match {
995-
let (regex, replacement) = parse_normalize_rule(line)
996-
.unwrap_or_else(|| panic!("couldn't parse custom normalization rule: `{line}`"));
997-
Some((regex, replacement))
998-
} else {
999-
None
994+
let parsed = parse_cfg_name_directive(self, line, prefix);
995+
if parsed.outcome != MatchOutcome::Match {
996+
return None;
1000997
}
998+
let name = parsed.name.expect("successful match always has a name");
999+
1000+
let Some((regex, replacement)) = parse_normalize_rule(line) else {
1001+
panic!(
1002+
"couldn't parse custom normalization rule: `{line}`\n\
1003+
help: expected syntax is: `{prefix}-{name}: \"REGEX\" -> \"REPLACEMENT\"`"
1004+
);
1005+
};
1006+
Some((regex, replacement))
10011007
}
10021008

10031009
fn parse_name_directive(&self, line: &str, directive: &str) -> bool {

0 commit comments

Comments
 (0)