bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #69205 - JohnTitor:allow-whitespaces, r=Mark-Simulacrum

Browse source 
Allow whitespaces in revision flags

Allow whitespaces in revision flags, like `// [foo]`.

Fixes #69183
This commit is contained in:
Dylan DPC 2020-02-18 16:07:27 +01:00 • committed by GitHub
commit bea18c7673
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tools/compiletest/src/header.rs
View file

@ -631,10 +631,6 @@ fn iter_header<R: Read>(testfile: &Path, cfg: Option<&str>, rdr: R, it: &mut dyn
let comment = if testfile.to_string_lossy().ends_with(".rs") { "//" } else { "#" }; let comment = if testfile.to_string_lossy().ends_with(".rs") { "//" } else { "#" };
// FIXME: would be nice to allow some whitespace between comment and brace :)
// It took me like 2 days to debug why compile-flags weren’t taken into account for my test :)
let comment_with_brace = comment.to_string() + "[";
let mut rdr = BufReader::new(rdr); let mut rdr = BufReader::new(rdr);
let mut ln = String::new(); let mut ln = String::new();
@ -650,7 +646,7 @@ fn iter_header<R: Read>(testfile: &Path, cfg: Option<&str>, rdr: R, it: &mut dyn
let ln = ln.trim(); let ln = ln.trim();
if ln.starts_with("fn") || ln.starts_with("mod") { if ln.starts_with("fn") || ln.starts_with("mod") {
return; return;
} else if ln.starts_with(&comment_with_brace) { } else if ln.starts_with(comment) && ln[comment.len()..].trim_start().starts_with('[') {
// A comment like `//[foo]` is specific to revision `foo` // A comment like `//[foo]` is specific to revision `foo`
if let Some(close_brace) = ln.find(']') { if let Some(close_brace) = ln.find(']') {
let open_brace = ln.find('[').unwrap(); let open_brace = ln.find('[').unwrap();
@ -663,10 +659,7 @@ fn iter_header<R: Read>(testfile: &Path, cfg: Option<&str>, rdr: R, it: &mut dyn
it(ln[(close_brace + 1)..].trim_start()); it(ln[(close_brace + 1)..].trim_start());
} }
} else { } else {
panic!( panic!("malformed condition directive: expected `{}[foo]`, found `{}`", comment, ln)
"malformed condition directive: expected `{}foo]`, found `{}`",
comment_with_brace, ln
)
} }
} else if ln.starts_with(comment) { } else if ln.starts_with(comment) {
it(ln[comment.len()..].trim_start()); it(ln[comment.len()..].trim_start());