diff options
| author | Marvin Löbel <loebel.marvin@gmail.com> | 2015-02-19 14:36:58 +0100 |
|---|---|---|
| committer | Marvin Löbel <loebel.marvin@gmail.com> | 2015-02-20 00:58:15 +0100 |
| commit | c8dd2d066d7b25246d2b940b7c161b8b67608b74 (patch) | |
| tree | 7b6c4fecc16df3ccfc388d16b46011be49a864ba /src/compiletest | |
| parent | a641996796f0ab11021671c0ce70a3c975bb4e37 (diff) | |
| download | rust-c8dd2d066d7b25246d2b940b7c161b8b67608b74.tar.gz rust-c8dd2d066d7b25246d2b940b7c161b8b67608b74.zip | |
Addressed PR comments
Diffstat (limited to 'src/compiletest')
| -rw-r--r-- | src/compiletest/compiletest.rs | 2 | ||||
| -rw-r--r-- | src/compiletest/errors.rs | 2 | ||||
| -rw-r--r-- | src/compiletest/header.rs | 2 | ||||
| -rw-r--r-- | src/compiletest/runtest.rs | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 30de253fbad..278ce5565d9 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -23,7 +23,7 @@ #![feature(env)] #![feature(core)] -// #![deny(warnings)] +#![deny(warnings)] extern crate test; extern crate getopts; diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs index d8faa53a2de..7411a9b48d4 100644 --- a/src/compiletest/errors.rs +++ b/src/compiletest/errors.rs @@ -58,7 +58,7 @@ pub fn load_errors(testfile: &Path) -> Vec<ExpectedError> { fn parse_expected(last_nonfollow_error: Option<uint>, line_num: uint, line: &str) -> Option<(WhichLine, ExpectedError)> { - let start = match line.find_str("//~") { Some(i) => i, None => return None }; + let start = match line.find("//~") { Some(i) => i, None => return None }; let (follow, adjusts) = if line.char_at(start + 3) == '|' { (true, 0) } else { diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs index c2539679643..9c217651c3e 100644 --- a/src/compiletest/header.rs +++ b/src/compiletest/header.rs @@ -330,7 +330,7 @@ fn parse_name_directive(line: &str, directive: &str) -> bool { pub fn parse_name_value_directive(line: &str, directive: &str) -> Option<String> { let keycolon = format!("{}:", directive); - match line.find_str(&keycolon) { + match line.find(&keycolon) { Some(colon) => { let value = line[(colon + keycolon.len()) .. line.len()].to_string(); debug!("{}: {}", directive, value); diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index 1cbb8742bbc..39ecc323125 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -847,7 +847,7 @@ fn check_debugger_output(debugger_run_result: &ProcRes, check_lines: &[String]) check_lines.iter().map(|s| { s .trim() - .split_str("[...]") + .split("[...]") .map(|x| x.to_string()) .collect() }).collect(); @@ -866,7 +866,7 @@ fn check_debugger_output(debugger_run_result: &ProcRes, check_lines: &[String]) None } } else { - rest.find_str(frag) + rest.find(frag) }; match found { None => { |