Skip to content

Commit

Permalink
compiletest: Better error message for bad normalize-* headers
Browse files Browse the repository at this point in the history
  • Loading branch information
Zalathar committed Jul 11, 2024
1 parent fdf7ea6 commit 08a2992
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions src/tools/compiletest/src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -991,13 +991,19 @@ impl Config {
}

fn parse_custom_normalization(&self, line: &str, prefix: &str) -> Option<(String, String)> {
if parse_cfg_name_directive(self, line, prefix).outcome == MatchOutcome::Match {
let (regex, replacement) = parse_normalize_rule(line)
.unwrap_or_else(|| panic!("couldn't parse custom normalization rule: `{line}`"));
Some((regex, replacement))
} else {
None
let parsed = parse_cfg_name_directive(self, line, prefix);
if parsed.outcome != MatchOutcome::Match {
return None;
}
let name = parsed.name.expect("successful match always has a name");

let Some((regex, replacement)) = parse_normalize_rule(line) else {
panic!(
"couldn't parse custom normalization rule: `{line}`\n\
help: expected syntax is: `{prefix}-{name}: \"REGEX\" -> \"REPLACEMENT\"`"
);
};
Some((regex, replacement))
}

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

0 comments on commit 08a2992

Please sign in to comment.