diff options
Diffstat (limited to 'src/compiletest')
| -rw-r--r-- | src/compiletest/compiletest.rs | 4 | ||||
| -rw-r--r-- | src/compiletest/errors.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 47ab675aff9..375dd138c22 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -393,7 +393,7 @@ fn extract_gdb_version(full_version_line: Option<String>) -> Option<String> { match re.captures(full_version_line) { Some(captures) => { - Some(captures.at(2).to_string()) + Some(captures.at(2).unwrap_or("").to_string()) } None => { println!("Could not extract GDB version from line '{}'", @@ -427,7 +427,7 @@ fn extract_lldb_version(full_version_line: Option<String>) -> Option<String> { match re.captures(full_version_line) { Some(captures) => { - Some(captures.at(1).to_string()) + Some(captures.at(1).unwrap_or("").to_string()) } None => { println!("Could not extract LLDB version from line '{}'", diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs index f15db7d9371..b7df43aabdd 100644 --- a/src/compiletest/errors.rs +++ b/src/compiletest/errors.rs @@ -66,10 +66,10 @@ fn parse_expected(last_nonfollow_error: Option<uint>, line: &str, re: &Regex) -> Option<(WhichLine, ExpectedError)> { re.captures(line).and_then(|caps| { - let adjusts = caps.name("adjusts").len(); - let kind = caps.name("kind").to_ascii_lower(); - let msg = caps.name("msg").trim().to_string(); - let follow = caps.name("follow").len() > 0; + let adjusts = caps.name("adjusts").unwrap_or("").len(); + let kind = caps.name("kind").unwrap_or("").to_ascii_lower(); + let msg = caps.name("msg").unwrap_or("").trim().to_string(); + let follow = caps.name("follow").unwrap_or("").len() > 0; let (which, line) = if follow { assert!(adjusts == 0, "use either //~| or //~^, not both."); |