squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #2952

Browse source 
2952: Simplify fixture parsing r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-01-30 12:18:32 +00:00 committed by GitHub
commit 0c2e7032b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/test_utils/src/lib.rs
View file

@ -188,29 +188,16 @@ pub fn parse_fixture(fixture: &str) -> Vec<FixtureEntry> {
}
});
let mut res = Vec::new();
let mut meta = None;
loop {
let mut next_meta = None;
let mut text = String::new();
for line in lines.by_ref() {
if line.starts_with("//-") {
next_meta = Some(line["//-".len()..].trim().to_string());
break;
}
text.push_str(line);
text.push('\n');
}
if let Some(meta) = meta {
res.push(FixtureEntry { meta, text });
}
meta = next_meta;
if meta.is_none() {
break;
let mut res: Vec<FixtureEntry> = Vec::new();
for line in lines.by_ref() {
if line.starts_with("//-") {
let meta = line["//-".len()..].trim().to_string();
res.push(FixtureEntry { meta, text: String::new() })
} else if let Some(entry) = res.last_mut() {
entry.text.push_str(line);
entry.text.push('\n');
}
}
res
}