mirror of
https://gitee.com/openharmony/third_party_rust_version_check
synced 2024-11-26 17:40:55 +00:00
Tidy verbose parsing, unify tests.
This commit is contained in:
Sergio Benitez
parent
cb8592005c
commit
dba235292c
225
src/lib.rs
225
src/lib.rs
@ -95,25 +95,22 @@ fn version_and_date_from_rustc_version(s: &str) -> (Option<String>, Option<Strin
|
||||
|
||||
/// Parses (version, date) as available from rustc verbose version output.
|
||||
fn version_and_date_from_rustc_verbose_version(s: &str) -> (Option<String>, Option<String>) {
|
||||
let mut version = None;
|
||||
let mut date = None;
|
||||
let (mut version, mut date) = (None, None);
|
||||
for line in s.lines() {
|
||||
if line.starts_with("rustc ") {
|
||||
// Conservatively parse the "header" line
|
||||
let (v, d) = version_and_date_from_rustc_version(line);
|
||||
version = version.or(v);
|
||||
date = date.or(d);
|
||||
} else {
|
||||
// Treat other fields as authoritative if present
|
||||
let split = |s: &str| s.splitn(2, ": ").nth(1).map(str::to_string);
|
||||
if line.starts_with("release: ") {
|
||||
version = split(line);
|
||||
} else if line.starts_with("commit-date: ") {
|
||||
// Git info isn't available with out-of-tree rustc builds
|
||||
date = if line.ends_with("unknown") { None } else { split(line) };
|
||||
}
|
||||
let split = |s: &str| s.splitn(2, ":").nth(1).map(|s| s.trim().to_string());
|
||||
match line.trim().split(" ").nth(0) {
|
||||
Some("rustc") => {
|
||||
let (v, d) = version_and_date_from_rustc_version(line);
|
||||
version = version.or(v);
|
||||
date = date.or(d);
|
||||
},
|
||||
Some("release:") => version = split(line),
|
||||
Some("commit-date:") if line.ends_with("unknown") => date = None,
|
||||
Some("commit-date:") => date = split(line),
|
||||
_ => continue
|
||||
}
|
||||
}
|
||||
|
||||
(version, date)
|
||||
}
|
||||
|
||||
@ -263,135 +260,109 @@ mod tests {
|
||||
use super::version_and_date_from_rustc_verbose_version;
|
||||
|
||||
macro_rules! check_parse {
|
||||
($s:expr => $v:expr, $d:expr) => (
|
||||
if let (Some(v), d) = version_and_date_from_rustc_version($s) {
|
||||
(@ $f:expr, $s:expr => $v:expr, $d:expr) => ({
|
||||
if let (Some(v), d) = $f($s) {
|
||||
let e_d: Option<&str> = $d.into();
|
||||
assert_eq!((v, d), ($v.into(), e_d.map(|s| s.into())));
|
||||
} else {
|
||||
panic!("{:?} didn't parse for version testing.", $s);
|
||||
}
|
||||
)
|
||||
});
|
||||
($f:expr, $s:expr => $v:expr, $d:expr) => ({
|
||||
let warn = "warning: invalid logging spec 'warning', ignoring it";
|
||||
let warn2 = "warning: sorry, something went wrong :(sad)";
|
||||
check_parse!(@ $f, $s => $v, $d);
|
||||
check_parse!(@ $f, &format!("{}\n{}", warn, $s) => $v, $d);
|
||||
check_parse!(@ $f, &format!("{}\n{}", warn2, $s) => $v, $d);
|
||||
check_parse!(@ $f, &format!("{}\n{}\n{}", warn, warn2, $s) => $v, $d);
|
||||
check_parse!(@ $f, &format!("{}\n{}\n{}", warn2, warn, $s) => $v, $d);
|
||||
})
|
||||
}
|
||||
|
||||
macro_rules! check_terse_parse {
|
||||
($($s:expr => $v:expr, $d:expr,)+) => {$(
|
||||
check_parse!(version_and_date_from_rustc_version, $s => $v, $d);
|
||||
)+}
|
||||
}
|
||||
|
||||
macro_rules! check_verbose_parse {
|
||||
($($s:expr => $v:expr, $d:expr,)+) => {$(
|
||||
check_parse!(version_and_date_from_rustc_verbose_version, $s => $v, $d);
|
||||
)+}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_version_parse() {
|
||||
check_parse!("rustc 1.18.0" => "1.18.0", None);
|
||||
check_parse!("rustc 1.8.0" => "1.8.0", None);
|
||||
check_parse!("rustc 1.20.0-nightly" => "1.20.0-nightly", None);
|
||||
check_parse!("rustc 1.20" => "1.20", None);
|
||||
check_parse!("rustc 1.3" => "1.3", None);
|
||||
check_parse!("rustc 1" => "1", None);
|
||||
check_parse!("rustc 1.5.1-beta" => "1.5.1-beta", None);
|
||||
|
||||
// Because of 1.0.0, we can't use Option<T>: From<T>.
|
||||
check_parse!("rustc 1.20.0 (2017-07-09)"
|
||||
=> "1.20.0", Some("2017-07-09"));
|
||||
|
||||
check_parse!("rustc 1.20.0-dev (2017-07-09)"
|
||||
=> "1.20.0-dev", Some("2017-07-09"));
|
||||
|
||||
check_parse!("rustc 1.20.0-nightly (d84693b93 2017-07-09)"
|
||||
=> "1.20.0-nightly", Some("2017-07-09"));
|
||||
|
||||
check_parse!("rustc 1.20.0 (d84693b93 2017-07-09)"
|
||||
=> "1.20.0", Some("2017-07-09"));
|
||||
|
||||
check_parse!("warning: invalid logging spec 'warning', ignoring it
|
||||
rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)"
|
||||
=> "1.30.0-nightly", Some("2018-09-20"));
|
||||
|
||||
check_parse!("warning: invalid logging spec 'warning', ignoring it\n
|
||||
rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)"
|
||||
=> "1.30.0-nightly", Some("2018-09-20"));
|
||||
|
||||
check_parse!("warning: invalid logging spec 'warning', ignoring it
|
||||
warning: something else went wrong
|
||||
rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)"
|
||||
=> "1.30.0-nightly", Some("2018-09-20"));
|
||||
check_terse_parse! {
|
||||
"rustc 1.18.0" => "1.18.0", None,
|
||||
"rustc 1.8.0" => "1.8.0", None,
|
||||
"rustc 1.20.0-nightly" => "1.20.0-nightly", None,
|
||||
"rustc 1.20" => "1.20", None,
|
||||
"rustc 1.3" => "1.3", None,
|
||||
"rustc 1" => "1", None,
|
||||
"rustc 1.5.1-beta" => "1.5.1-beta", None,
|
||||
"rustc 1.20.0 (2017-07-09)" => "1.20.0", Some("2017-07-09"),
|
||||
"rustc 1.20.0-dev (2017-07-09)" => "1.20.0-dev", Some("2017-07-09"),
|
||||
"rustc 1.20.0-nightly (d84693b93 2017-07-09)" => "1.20.0-nightly", Some("2017-07-09"),
|
||||
"rustc 1.20.0 (d84693b93 2017-07-09)" => "1.20.0", Some("2017-07-09"),
|
||||
"rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)" => "1.30.0-nightly", Some("2018-09-20"),
|
||||
};
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_verbose_version_parse() {
|
||||
let mut versions = vec![];
|
||||
check_verbose_parse! {
|
||||
"rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)\n\
|
||||
binary: rustc\n\
|
||||
commit-hash: a59de37e99060162a2674e3ff45409ac73595c0e\n\
|
||||
commit-date: 2015-05-13\n\
|
||||
build-date: 2015-05-14\n\
|
||||
host: x86_64-unknown-linux-gnu\n\
|
||||
release: 1.0.0" => "1.0.0", Some("2015-05-13"),
|
||||
|
||||
versions.push(("\
|
||||
rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)
|
||||
binary: rustc
|
||||
commit-hash: a59de37e99060162a2674e3ff45409ac73595c0e
|
||||
commit-date: 2015-05-13
|
||||
build-date: 2015-05-14
|
||||
host: x86_64-unknown-linux-gnu
|
||||
release: 1.0.0
|
||||
", "1.0.0", Some("2015-05-13")));
|
||||
"rustc 1.0.0 (a59de37e9 2015-05-13) (built 2015-05-14)\n\
|
||||
commit-hash: a59de37e99060162a2674e3ff45409ac73595c0e\n\
|
||||
commit-date: 2015-05-13\n\
|
||||
build-date: 2015-05-14\n\
|
||||
host: x86_64-unknown-linux-gnu\n\
|
||||
release: 1.0.0" => "1.0.0", Some("2015-05-13"),
|
||||
|
||||
versions.push(("\
|
||||
rustc 1.50.0 (cb75ad5db 2021-02-10)
|
||||
binary: rustc
|
||||
commit-hash: cb75ad5db02783e8b0222fee363c5f63f7e2cf5b
|
||||
commit-date: 2021-02-10
|
||||
host: x86_64-unknown-linux-gnu
|
||||
release: 1.50.0
|
||||
", "1.50.0", Some("2021-02-10")));
|
||||
"rustc 1.50.0 (cb75ad5db 2021-02-10)\n\
|
||||
binary: rustc\n\
|
||||
commit-hash: cb75ad5db02783e8b0222fee363c5f63f7e2cf5b\n\
|
||||
commit-date: 2021-02-10\n\
|
||||
host: x86_64-unknown-linux-gnu\n\
|
||||
release: 1.50.0" => "1.50.0", Some("2021-02-10"),
|
||||
|
||||
versions.push(("\
|
||||
rustc 1.52.0-nightly (234781afe 2021-03-07)
|
||||
binary: rustc
|
||||
commit-hash: 234781afe33d3f339b002f85f948046d8476cfc9
|
||||
commit-date: 2021-03-07
|
||||
host: x86_64-unknown-linux-gnu
|
||||
release: 1.52.0-nightly
|
||||
LLVM version: 12.0.0
|
||||
", "1.52.0-nightly", Some("2021-03-07")));
|
||||
"rustc 1.52.0-nightly (234781afe 2021-03-07)\n\
|
||||
binary: rustc\n\
|
||||
commit-hash: 234781afe33d3f339b002f85f948046d8476cfc9\n\
|
||||
commit-date: 2021-03-07\n\
|
||||
host: x86_64-unknown-linux-gnu\n\
|
||||
release: 1.52.0-nightly\n\
|
||||
LLVM version: 12.0.0" => "1.52.0-nightly", Some("2021-03-07"),
|
||||
|
||||
versions.push(("\
|
||||
rustc 1.41.1
|
||||
binary: rustc
|
||||
commit-hash: unknown
|
||||
commit-date: unknown
|
||||
host: x86_64-unknown-linux-gnu
|
||||
release: 1.41.1
|
||||
LLVM version: 7.0
|
||||
", "1.41.1", None));
|
||||
"rustc 1.41.1\n\
|
||||
binary: rustc\n\
|
||||
commit-hash: unknown\n\
|
||||
commit-date: unknown\n\
|
||||
host: x86_64-unknown-linux-gnu\n\
|
||||
release: 1.41.1\n\
|
||||
LLVM version: 7.0" => "1.41.1", None,
|
||||
|
||||
versions.push(("\
|
||||
rustc 1.49.0
|
||||
binary: rustc
|
||||
commit-hash: unknown
|
||||
commit-date: unknown
|
||||
host: x86_64-unknown-linux-gnu
|
||||
release: 1.49.0
|
||||
", "1.49.0", None));
|
||||
"rustc 1.49.0\n\
|
||||
binary: rustc\n\
|
||||
commit-hash: unknown\n\
|
||||
commit-date: unknown\n\
|
||||
host: x86_64-unknown-linux-gnu\n\
|
||||
release: 1.49.0" => "1.49.0", None,
|
||||
|
||||
versions.push(("\
|
||||
rustc 1.50.0 (Fedora 1.50.0-1.fc33)
|
||||
binary: rustc
|
||||
commit-hash: unknown
|
||||
commit-date: unknown
|
||||
host: x86_64-unknown-linux-gnu
|
||||
release: 1.50.0
|
||||
", "1.50.0", None));
|
||||
|
||||
// Now compare what we parse to expected values
|
||||
for (s, expected_version, expected_date) in versions {
|
||||
if let (Some(version), date) = version_and_date_from_rustc_verbose_version(s) {
|
||||
assert_eq!(version, expected_version);
|
||||
assert_eq!(date.as_ref().map(|d| &**d), expected_date);
|
||||
} else {
|
||||
panic!("{:?} didn't parse for version testing.", s);
|
||||
}
|
||||
|
||||
// Throw in a few warning lines
|
||||
let warnings = "\
|
||||
warning: invalid logging spec 'warning', ignoring it
|
||||
warning: something else went wrong
|
||||
";
|
||||
let w = format!("{}{}", warnings, s);
|
||||
if let (Some(version), date) = version_and_date_from_rustc_verbose_version(&w) {
|
||||
assert_eq!(version, expected_version);
|
||||
assert_eq!(date.as_ref().map(|d| &**d), expected_date);
|
||||
} else {
|
||||
panic!("{:?} didn't parse for version testing.", s);
|
||||
}
|
||||
}
|
||||
"rustc 1.50.0 (Fedora 1.50.0-1.fc33)\n\
|
||||
binary: rustc\n\
|
||||
commit-hash: unknown\n\
|
||||
commit-date: unknown\n\
|
||||
host: x86_64-unknown-linux-gnu\n\
|
||||
release: 1.50.0" => "1.50.0", None,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user