test_utils: move flush!() to its usage as per conversation with @matklad

This commit is contained in:
Veetaha 2020-01-29 03:53:15 +02:00
parent d3472e8ae4
commit 5e1ae1d7aa

View file

@ -169,19 +169,6 @@ pub struct FixtureEntry {
/// // - other meta /// // - other meta
/// ``` /// ```
pub fn parse_fixture(fixture: &str) -> Vec<FixtureEntry> { pub fn parse_fixture(fixture: &str) -> Vec<FixtureEntry> {
let mut res = Vec::new();
let mut buf = String::new();
let mut meta: Option<&str> = None;
macro_rules! flush {
() => {
if let Some(meta) = meta {
res.push(FixtureEntry { meta: meta.to_string(), text: buf.clone() });
buf.clear();
}
};
};
let margin = fixture let margin = fixture
.lines() .lines()
.filter(|it| it.trim_start().starts_with("//-")) .filter(|it| it.trim_start().starts_with("//-"))
@ -201,6 +188,19 @@ pub fn parse_fixture(fixture: &str) -> Vec<FixtureEntry> {
} }
}); });
let mut res = Vec::new();
let mut buf = String::new();
let mut meta: Option<&str> = None;
macro_rules! flush {
() => {
if let Some(meta) = meta {
res.push(FixtureEntry { meta: meta.to_string(), text: buf.clone() });
buf.clear();
}
};
};
for line in lines { for line in lines {
if line.starts_with("//-") { if line.starts_with("//-") {
flush!(); flush!();