Skip to content

Commit 78e0f2f

Browse files
authored
Rollup merge of rust-lang#84132 - Manishearth:lldb-nonstandard, r=Mark-Simulacrum
Ignore nonstandard lldb version strings in compiletest Fixes rust-lang#84131 Unsure if I should do the same for the Apple LLDB branch above.
2 parents 1919b3f + afaefea commit 78e0f2f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/tools/compiletest/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ fn extract_lldb_version(full_version_line: &str) -> Option<(u32, bool)> {
975975
}
976976
} else if let Some(lldb_ver) = full_version_line.strip_prefix("lldb version ") {
977977
if let Some(idx) = lldb_ver.find(not_a_digit) {
978-
let version: u32 = lldb_ver[..idx].parse().unwrap();
978+
let version: u32 = lldb_ver[..idx].parse().ok()?;
979979
return Some((version * 100, full_version_line.contains("rust-enabled")));
980980
}
981981
}

0 commit comments

Comments
 (0)