diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-04-27 19:08:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 19:08:45 +0200 |
| commit | 78e0f2f52db304187677e89089d59bf6531d6c4f (patch) | |
| tree | 8ca6cc7509225e37d29d8950e147329ca48b6c09 | |
| parent | 1919b3f22706fee0b2c6ac3d42316545900b7734 (diff) | |
| parent | afaefea17e96b3aa7f7eb00fd0791e8fd187bc26 (diff) | |
| download | rust-78e0f2f52db304187677e89089d59bf6531d6c4f.tar.gz rust-78e0f2f52db304187677e89089d59bf6531d6c4f.zip | |
Rollup merge of #84132 - Manishearth:lldb-nonstandard, r=Mark-Simulacrum
Ignore nonstandard lldb version strings in compiletest Fixes https://github.com/rust-lang/rust/issues/84131 Unsure if I should do the same for the Apple LLDB branch above.
| -rw-r--r-- | src/tools/compiletest/src/main.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index 48091601861..d1798a52df7 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -975,7 +975,7 @@ fn extract_lldb_version(full_version_line: &str) -> Option<(u32, bool)> { } } else if let Some(lldb_ver) = full_version_line.strip_prefix("lldb version ") { if let Some(idx) = lldb_ver.find(not_a_digit) { - let version: u32 = lldb_ver[..idx].parse().unwrap(); + let version: u32 = lldb_ver[..idx].parse().ok()?; return Some((version * 100, full_version_line.contains("rust-enabled"))); } } |