Do not output () on empty description#130900
Merged
bors merged 1 commit intorust-lang:masterfrom Oct 14, 2024
Merged
Conversation
Collaborator
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @albertlarsan68 (or someone else) some time within the next two weeks. Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (
|
rustbot
added
S-waiting-on-review
albertlarsan68
approved these changes
Oct 13, 2024
Member
albertlarsan68
left a comment
albertlarsan68
left a comment
There was a problem hiding this comment.
LGTM, sorry for the delay!
Member
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 13, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#130356 (don't warn about a missing change-id in CI) - rust-lang#130900 (Do not output () on empty description) - rust-lang#131066 (Add the Chinese translation entry to the RustByExample build process) - rust-lang#131067 (Fix std_detect links) - rust-lang#131644 (Clean up some Miri things in `sys/windows`) - rust-lang#131646 (sys/unix: add comments for some Miri fallbacks) - rust-lang#131653 (Remove const trait bound modifier hack) - rust-lang#131659 (enable `download_ci_llvm` test) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 13, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#130356 (don't warn about a missing change-id in CI) - rust-lang#130900 (Do not output () on empty description) - rust-lang#131066 (Add the Chinese translation entry to the RustByExample build process) - rust-lang#131067 (Fix std_detect links) - rust-lang#131644 (Clean up some Miri things in `sys/windows`) - rust-lang#131646 (sys/unix: add comments for some Miri fallbacks) - rust-lang#131653 (Remove const trait bound modifier hack) - rust-lang#131659 (enable `download_ci_llvm` test) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 14, 2024
Rollup merge of rust-lang#130900 - capickett:empty-description-rust-version, r=albertlarsan68 Do not output () on empty description When passing an explicitly empty description string, as explained here https://github.com/rust-lang/rust/blob/master/config.example.toml#L611-L613, my expectation is that the resulting rustc will be compatible with upstream. However, it seems that instead, a `()` is added to the end of the version string, causing the version compatibility check to fail. My proposed fix here would be to instead only print `({description})` if `description` is a non-empty string.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
When passing an explicitly empty description string, as explained here https://github.com/rust-lang/rust/blob/master/config.example.toml#L611-L613, my expectation is that the resulting rustc will be compatible with upstream.
However, it seems that instead, a
()is added to the end of the version string, causing the version compatibility check to fail. My proposed fix here would be to instead only print({description})ifdescriptionis a non-empty string.