compiletest: handle llvm_version with suffix like "12.0.0libcxx" #83511
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ rollup |
|
📌 Commit 656f6ac has been approved by |
bors
added
S-waiting-on-bors
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Mar 27, 2021
…=Mark-Simulacrum compiletest: handle llvm_version with suffix like "12.0.0libcxx" The previous code only remove the suffix begin with `-`, but Gentoo Linux [define `LLVM_VERSION_SUFFIX="libcxx"`](https://github.com/gentoo/gentoo/blob/604d79f327176eecb05293d7154e24231229cb31/sys-devel/llvm/llvm-11.1.0.ebuild#L378) when llvm is linked to libc++ and lead to a panic: ``` thread 'main' panicked at 'Malformed version component: ParseIntError { kind: InvalidDigit }', src/tools/compiletest/src/header.rs:968:28 ``` This new code will handle all suffix not beginning with digit or dot.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2021
Rollup of 9 pull requests Successful merges: - rust-lang#83239 (Remove/replace some outdated crates from the dependency tree) - rust-lang#83328 (Fixes to inline assmebly tests) - rust-lang#83343 (Simplify and fix byte skipping in format! string parser) - rust-lang#83388 (Make # pretty print format easier to discover) - rust-lang#83431 (Tell GitHub to highlight `config.toml.example` as TOML) - rust-lang#83508 (Use the direct link to the platform support page) - rust-lang#83511 (compiletest: handle llvm_version with suffix like "12.0.0libcxx") - rust-lang#83524 (Document that the SocketAddr memory representation is not stable) - rust-lang#83525 (fix doc comment for `ty::Dynamic`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous code only remove the suffix begin with
-, but Gentoo Linux defineLLVM_VERSION_SUFFIX="libcxx"when llvm is linked to libc++ and lead to a panic:This new code will handle all suffix not beginning with digit or dot.