dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #61496 - Mark-Simulacrum:tidy-unbalanced-parens, r=varkor 

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

Fixes #60505
This commit is contained in:
Mazdak Farrokhzad 2019-06-04 04:48:27 +02:00 committed by GitHub
parent cb2feb6460 242056cadf
commit 6ad6ef2355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/tidy/src/pal.rs
View File

@ -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()
}