diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-06-27 22:29:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-27 22:29:54 -0700 |
| commit | 45ec25e088efeabd21c793bde8ab7a05103cc8d2 (patch) | |
| tree | b1a08afe328fb015ae64ee5eb13f3ebc85a23898 /src/tools/compiletest | |
| parent | 6a944c15ab87ae6a2cb4a22b4781f39b8955031b (diff) | |
| parent | 49f6166ef7825a39e980c0ba0904073379bb01e6 (diff) | |
Rollup merge of #73525 - cuviper:llvm11, r=nikic
Prepare for LLVM 11 These are just the code changes needed to build with the current LLVM master (version 11). r? @nikic
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 7d2c83881d1..571e7a59113 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -263,7 +263,7 @@ impl EarlyProps { } fn version_to_int(version: &str) -> u32 { - let version_without_suffix = version.split('-').next().unwrap(); + let version_without_suffix = version.trim_end_matches("git").split('-').next().unwrap(); let components: Vec<u32> = version_without_suffix .split('.') .map(|s| s.parse().expect("Malformed version component")) |