x.py: allow a custom string appended to the version #79115
Merged
Conversation
This file contains 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
This adds `rust.description` to the config as a descriptive string to be
appended to `rustc --version` output, which is also used in places like
debuginfo `DW_AT_producer`. This may be useful for supplementary build
information, like distro-specific package versions.
For example, in Fedora 33, `gcc --version` outputs:
gcc (GCC) 10.2.1 20201016 (Red Hat 10.2.1-6)
With this change, we can add similar vendor info to `rustc --version`.
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
jyn514
added
T-bootstrap
|
I would like to briefly run this by @rust-lang/release in case there's any concerns, but otherwise this seems good to me from an implementation perspective. |
Mark-Simulacrum
added
T-release
|
I support this! It will be really useful for toolchain vendors to identify if an issue is coming from their build and whether a binary/bugreport is coming from their toolchain or not. |
|
While I'd love to see something like this added to the compiler, there are two questions I have:
|
There's already a difference in whether git info is present, e.g. rustup's Tools that parse should use
IMO we should let it be freeform, and don't offer any expectation of parsing meaning from this. If we wanted to add verbose fields for structured vendor specifics, that's possible, but ISTR it has been a problem for version-parsing crates to change/add fields. |
|
@bors r+ I figure we can iterate if needed. |
|
📌 Commit 5f08568 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Nov 21, 2020
…mulacrum
x.py: allow a custom string appended to the version
This adds `rust.description` to the config as a descriptive string to be
appended to `rustc --version` output, which is also used in places like
debuginfo `DW_AT_producer`. This may be useful for supplementary build
information, like distro-specific package versions.
For example, in Fedora 33, `gcc --version` outputs:
gcc (GCC) 10.2.1 20201016 (Red Hat 10.2.1-6)
With this change, we can add similar vendor info to `rustc --version`.
|
⌛ Testing commit 5f08568 with merge b5d6b6e202853e4b132cb605bafae8fede3dc911... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
@bors retry |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
cuviper
added a commit
to cuviper/version_check
that referenced
this pull request
Mar 8, 2021
The plain `rustc --version` string is not well structured, and in particular the git commit info is not necessarily present when rustc was built out of tree, like distro builds. Furthermore, rust-lang/rust#79115 made it possible to have completely custom information in that version's parenthesized block, which may not look like git info at all. Adding `--verbose` outputs each field on its own line, in particular "release: ..." for the version number and "commit-date: ..." for the git info, although the latter is just "unknown" for out-of-tree builds. This still works all the way back to Rust 1.0.0.
cuviper
added a commit
to cuviper/version_check
that referenced
this pull request
Mar 8, 2021
The plain `rustc --version` string is not well structured, and in particular the git commit info is not necessarily present when rustc was built out of tree, like distro builds. Furthermore, rust-lang/rust#79115 made it possible to have completely custom information in that version's parenthesized block, which may not look like git info at all. Adding `--verbose` outputs each field on its own line, in particular "release: ..." for the version number and "commit-date: ..." for the git info, although the latter is just "unknown" for out-of-tree builds. This still works all the way back to Rust 1.0.0.
cuviper
added a commit
to cuviper/version_check
that referenced
this pull request
Mar 8, 2021
The plain `rustc --version` string is not well structured, and in particular the git commit info is not necessarily present when rustc was built out of tree, like distro builds. Furthermore, rust-lang/rust#79115 made it possible to have completely custom information in that version's parenthesized block, which may not look like git info at all. Adding `--verbose` outputs each field on its own line, in particular "release: ..." for the version number and "commit-date: ..." for the git info, although the latter is just "unknown" for out-of-tree builds. This still works all the way back to Rust 1.0.0.
cuviper
added a commit
to cuviper/version_check
that referenced
this pull request
Mar 8, 2021
The plain `rustc --version` string is not well structured, and in particular the git commit info is not necessarily present when rustc was built out of tree, like distro builds. Furthermore, rust-lang/rust#79115 made it possible to have completely custom information in that version's parenthesized block, which may not look like git info at all. Adding `--verbose` outputs each field on its own line, in particular "release: ..." for the version number and "commit-date: ..." for the git info, although the latter is just "unknown" for out-of-tree builds. This still works all the way back to Rust 1.0.0.
SergioBenitez
pushed a commit
to SergioBenitez/version_check
that referenced
this pull request
Mar 16, 2021
The plain `rustc --version` string is not well structured, and in particular the git commit info is not necessarily present when rustc is built out of tree, such as in distro builds. Furthermore, rust-lang/rust#79115 made it possible to have completely custom information in a version's parenthesized block, which may not look like git info at all. Adding `--verbose` outputs each field on its own line, in particular "release: ..." for the version number and "commit-date: ..." for the git info, although the latter is just "unknown" for out-of-tree builds. MSRV remains 1.0.0.
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.
This adds
rust.descriptionto the config as a descriptive string to beappended to
rustc --versionoutput, which is also used in places likedebuginfo
DW_AT_producer. This may be useful for supplementary buildinformation, like distro-specific package versions.
For example, in Fedora 33,
gcc --versionoutputs:With this change, we can add similar vendor info to
rustc --version.