rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #28638 - wthrowe:gdb-version, r=alexcrichton

Browse Source 
GDB 7.10 was recently released.
This commit is contained in:
bors
2015-09-26 11:16:40 +00:00
parent 6645ca1a85 1e0c23d781
commit b94c4f5996
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiletest/compiletest.rs
View File

@@ -348,7 +348,7 @@ fn extract_gdb_version(full_version_line: Option<String>) -> Option<String> {
if !full_version_line.trim().is_empty() => { if !full_version_line.trim().is_empty() => {
let full_version_line = full_version_line.trim(); let full_version_line = full_version_line.trim();
// used to be a regex "(^|[^0-9])([0-9]\.[0-9])([^0-9]|$)" // used to be a regex "(^|[^0-9])([0-9]\.[0-9]+)"
for (pos, c) in full_version_line.char_indices() { for (pos, c) in full_version_line.char_indices() {
if !c.is_digit(10) { continue } if !c.is_digit(10) { continue }
if pos + 2 >= full_version_line.len() { continue } if pos + 2 >= full_version_line.len() { continue }
@@ -357,11 +357,12 @@ fn extract_gdb_version(full_version_line: Option<String>) -> Option<String> {
if pos > 0 && full_version_line.char_at_reverse(pos).is_digit(10) { if pos > 0 && full_version_line.char_at_reverse(pos).is_digit(10) {
continue continue
} }
if pos + 3 < full_version_line.len() && let mut end = pos + 3;
full_version_line.char_at(pos + 3).is_digit(10) { while end < full_version_line.len() &&
continue full_version_line.char_at(end).is_digit(10) {
end += 1;
} }
return Some(full_version_line[pos..pos+3].to_owned()); return Some(full_version_line[pos..end].to_owned());
} }
println!("Could not extract GDB version from line '{}'", println!("Could not extract GDB version from line '{}'",
full_version_line); full_version_line);