Merge pull request Manishearth#153 from phansch/fix_compiletest_trim_deprecations

Fix `trim` deprecation warnings

Author: Thomas Bracht Laumann Jespersen

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,15 +143,15 @@ 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");
                     // Ignore if actual version is smaller the minimum required
                     // 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");
@@ -418,14 +418,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;

src/runtest.rs

@@ -1791,8 +1791,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 ")
@@ -1803,7 +1803,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;
@@ -2664,7 +2664,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
     }