Skip to content
Permalink
Browse files

Do not panic in tidy on unbalanced parentheses in cfg's

  • Loading branch information...
Mark-Simulacrum committed Jun 3, 2019
1 parent 7096ff0 commit 242056cadf2073325cc8b8edea9dd2960db99e93
Showing with 5 additions and 3 deletions.
  1. +5 −3 src/tools/tidy/src/pal.rs
@@ -204,7 +204,7 @@ fn parse_cfgs<'a>(contents: &'a str) -> Vec<(usize, &'a str)> {
succeeds_non_ident && preceeds_whitespace_and_paren
});

cfgs.map(|i| {
cfgs.flat_map(|i| {
let mut depth = 0;
let contents_from = &contents[i..];
for (j, byte) in contents_from.bytes().enumerate() {
@@ -215,13 +215,15 @@ fn parse_cfgs<'a>(contents: &'a str) -> Vec<(usize, &'a str)> {
b')' => {
depth -= 1;
if depth == 0 {
return (i, &contents_from[..=j]);
return Some((i, &contents_from[..=j]));
}
}
_ => { }
}
}

unreachable!()
// if the parentheses are unbalanced just ignore this cfg -- it'll be caught when attempting
// to run the compiler, and there's no real reason to lint it separately here
None
}).collect()
}

0 comments on commit 242056c

Please sign in to comment.
You can’t perform that action at this time.