diff --git a/src/header.rs b/src/header.rs index d57d0c1..466e2bc 100644 --- a/src/header.rs +++ b/src/header.rs @@ -122,7 +122,7 @@ impl EarlyProps { if let Some(ref actual_version) = config.lldb_version { if line.starts_with("min-lldb-version") { - let min_version = line.trim_right() + let min_version = line.trim_end() .rsplit(' ') .next() .expect("Malformed lldb version directive"); @@ -143,7 +143,7 @@ impl EarlyProps { } if let Some(ref actual_version) = config.llvm_version { if line.starts_with("min-llvm-version") { - let min_version = line.trim_right() + let min_version = line.trim_end() .rsplit(' ') .next() .expect("Malformed llvm version directive"); @@ -151,7 +151,7 @@ impl EarlyProps { // version &actual_version[..] < min_version } else if line.starts_with("min-system-llvm-version") { - let min_version = line.trim_right() + let min_version = line.trim_end() .rsplit(' ') .next() .expect("Malformed llvm version directive"); @@ -405,14 +405,14 @@ fn iter_header(testfile: &Path, cfg: Option<&str>, it: &mut FnMut(&str)) { None => false, }; if matches { - it(ln[(close_brace + 1) ..].trim_left()); + it(ln[(close_brace + 1) ..].trim_start()); } } else { panic!("malformed condition directive: expected `//[foo]`, found `{}`", ln) } } else if ln.starts_with("//") { - it(ln[2..].trim_left()); + it(ln[2..].trim_start()); } } return; diff --git a/src/runtest.rs b/src/runtest.rs index 26abe5c..261f697 100644 --- a/src/runtest.rs +++ b/src/runtest.rs @@ -1781,8 +1781,8 @@ actual:\n\ content.lines() .enumerate() .filter_map(|(line_nb, line)| { - if (line.trim_left().starts_with("pub mod ") || - line.trim_left().starts_with("mod ")) && + if (line.trim_start().starts_with("pub mod ") || + line.trim_start().starts_with("mod ")) && line.ends_with(';') { if let Some(ref mut other_files) = other_files { other_files.push(line.rsplit("mod ") @@ -1793,7 +1793,7 @@ actual:\n\ None } else { let sline = line.split("///").last().unwrap_or(""); - let line = sline.trim_left(); + let line = sline.trim_start(); if line.starts_with("```") { if ignore { ignore = false; @@ -2585,7 +2585,7 @@ fn normalize_mir_line(line: &str) -> String { fn nocomment_mir_line(line: &str) -> &str { if let Some(idx) = line.find("//") { let (l, _) = line.split_at(idx); - l.trim_right() + l.trim_end() } else { line }