Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION` by onur-ozkan · Pull Request #137723 · rust-lang/rust

onur-ozkan · 2025-02-27T12:23:45Z

Moves the description field from the rust section to the build section as it can be useful for tools and is not specific to rustc. Also passes this value to tool builds through the CFG_VER_DESCRIPTION env.

Motivated from https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Propagate.20rust.2Edescription.20to.20tools.20in.20dist.20build

rustbot · 2025-02-27T12:23:49Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-02-27T12:23:51Z

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

config.example.toml

emilyalbini · 2025-02-27T13:46:41Z

r? @pietroalbini

r=me with jieyouxu's comment fixed.

weihanglo

Looks great. Thanks for the patch!

onur-ozkan · 2025-02-27T17:25:57Z

@bors r=pietroalbini,weihanglo

bors · 2025-02-27T17:25:59Z

📌 Commit f877b12 has been approved by pietroalbini,weihanglo

It is now in the queue for this repository.

bors · 2025-02-27T17:26:00Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

cuviper · 2025-02-27T17:35:44Z

This should also be updated -- probably just s/rust/build/:

rust/src/bootstrap/configure.py

Lines 293 to 297 in 96cfc75

    
           v( 
        
               "release-description", 
        
               "rust.description", 
        
               "optional descriptive string for version output", 
        
           )

onur-ozkan · 2025-02-27T17:41:04Z

Right...

@bors r-

onur-ozkan · 2025-02-27T19:03:02Z

@bors r=pietroalbini,weihanglo

bors · 2025-02-27T19:03:05Z

📌 Commit 0f7da1a has been approved by pietroalbini,weihanglo

It is now in the queue for this repository.

bors · 2025-02-27T19:03:05Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

…pietroalbini,weihanglo Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION` Moves the `description` field from the `rust` section to the `build` section as it can be useful for tools and is not specific to rustc. Also passes this value to tool builds through the `CFG_VER_DESCRIPTION` env. Motivated from https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Propagate.20rust.2Edescription.20to.20tools.20in.20dist.20build

…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#137045 (Defer repeat expr `Copy` checks to end of type checking) - rust-lang#137171 (Suggest swapping equality on E0277) - rust-lang#137634 (Update `compiler-builtins` to 0.1.149) - rust-lang#137686 (Handle asm const similar to inline const) - rust-lang#137689 (Use `Binder<Vec<Ty>>` instead of `Vec<Binder<Ty>>` in both solvers for sized/auto traits/etc.) - rust-lang#137718 (Use original command for showing sccache stats) - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`) - rust-lang#137730 (checked_ilog tests: deal with a bit of float imprecision) - rust-lang#137735 (Update E0133 docs for 2024 edition) - rust-lang#137742 (unconditionally lower match arm even if it's unneeded for never pattern in match) - rust-lang#137771 (Tweak incorrect ABI suggestion) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#137045 (Defer repeat expr `Copy` checks to end of type checking) - rust-lang#137171 (Suggest swapping equality on E0277) - rust-lang#137686 (Handle asm const similar to inline const) - rust-lang#137689 (Use `Binder<Vec<Ty>>` instead of `Vec<Binder<Ty>>` in both solvers for sized/auto traits/etc.) - rust-lang#137718 (Use original command for showing sccache stats) - rust-lang#137730 (checked_ilog tests: deal with a bit of float imprecision) - rust-lang#137735 (Update E0133 docs for 2024 edition) - rust-lang#137742 (unconditionally lower match arm even if it's unneeded for never pattern in match) - rust-lang#137771 (Tweak incorrect ABI suggestion and make suggestion verbose) Failed merges: - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`) r? `@ghost` `@rustbot` modify labels: rollup

weihanglo · 2025-03-05T04:53:14Z

What happened to this CR got kicked out from rollup merge?

jieyouxu · 2025-03-05T05:26:42Z

Seems to have been forgotten by bors?

@bors r=pietroalbini,weihanglo

bors · 2025-03-05T05:26:45Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Rollup of 6 pull requests #138021

bors · 2025-03-05T05:26:46Z

📌 Commit 0f7da1a has been approved by pietroalbini,weihanglo

It is now in the queue for this repository.

workingjubilee · 2025-03-05T05:31:13Z

github says there's merge conflicts? can someone rebase this?

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan · 2025-03-05T05:40:21Z

github says there's merge conflicts? can someone rebase this?

Done

workingjubilee · 2025-03-05T06:14:24Z

cool!

@bors r=pietroalbini,weihanglo

bors · 2025-03-05T06:14:26Z

📌 Commit 9646c2f has been approved by pietroalbini,weihanglo

It is now in the queue for this repository.

…pietroalbini,weihanglo Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION` Moves the `description` field from the `rust` section to the `build` section as it can be useful for tools and is not specific to rustc. Also passes this value to tool builds through the `CFG_VER_DESCRIPTION` env. Motivated from https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Propagate.20rust.2Edescription.20to.20tools.20in.20dist.20build

…kingjubilee Rollup of 25 pull requests Successful merges: - rust-lang#134063 (dec2flt: Clean up float parsing modules) - rust-lang#136581 (Retire the legacy `Makefile`-based `run-make` test infra) - rust-lang#136662 (Count char width at most once in `Formatter::pad`) - rust-lang#136798 (Added documentation for flushing per rust-lang#74348) - rust-lang#137240 (Slightly reformat `std::fs::remove_dir_all` error docs) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137327 (Undeprecate env::home_dir) - rust-lang#137463 ([illumos] attempt to use posix_spawn to spawn processes) - rust-lang#137477 (uefi: Add Service Binding Protocol abstraction) - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - rust-lang#137569 (Stabilize `string_extend_from_within`) - rust-lang#137612 (Update bootstrap to edition 2024) - rust-lang#137633 (Only use implied bounds hack if bevy, and use deeply normalize in implied bounds hack) - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums) - rust-lang#137679 (Various coretests improvements) - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`) - rust-lang#137758 (fix usage of ty decl macro fragments in attributes) - rust-lang#137764 (Ensure that negative auto impls are always applicable) - rust-lang#137772 (Fix char count in `Display` for `ByteStr`) - rust-lang#137798 (ci: use ubuntu 24 on arm large runner) - rust-lang#137805 (adjust Layout debug printing to match the internal field name) - rust-lang#137808 (Do not require that unsafe fields lack drop glue) - rust-lang#137820 (Clarify why InhabitedPredicate::instantiate_opt exists) - rust-lang#137825 (Provide more context on resolve error caused from incorrect RTN) - rust-lang#138028 (compiler: add `ExternAbi::is_rustic_abi`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 20 pull requests Successful merges: - rust-lang#134063 (dec2flt: Clean up float parsing modules) - rust-lang#136581 (Retire the legacy `Makefile`-based `run-make` test infra) - rust-lang#136662 (Count char width at most once in `Formatter::pad`) - rust-lang#136764 (Make `ptr_cast_add_auto_to_object` lint into hard error) - rust-lang#136798 (Added documentation for flushing per rust-lang#74348) - rust-lang#136865 (Perform deeper compiletest path normalization for `$TEST_BUILD_DIR` to account for compare-mode/debugger cases, and normalize long type file filename hashes) - rust-lang#136975 (Look for `python3` first on MacOS, not `py`) - rust-lang#136977 (Upload Datadog metrics with citool) - rust-lang#137240 (Slightly reformat `std::fs::remove_dir_all` error docs) - rust-lang#137298 (Check signature WF when lowering MIR body) - rust-lang#137463 ([illumos] attempt to use posix_spawn to spawn processes) - rust-lang#137477 (uefi: Add Service Binding Protocol abstraction) - rust-lang#137569 (Stabilize `string_extend_from_within`) - rust-lang#137633 (Only use implied bounds hack if bevy, and use deeply normalize in implied bounds hack) - rust-lang#137679 (Various coretests improvements) - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`) - rust-lang#137728 (Remove unsizing coercions for tuples) - rust-lang#137731 (Resume one waiter at once in deadlock handler) - rust-lang#137875 (mir_build: Integrate "simplification" steps into match-pair-tree creation) - rust-lang#138028 (compiler: add `ExternAbi::is_rustic_abi`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#137723 - onur-ozkan:cfg-ver-description, r=pietroalbini,weihanglo Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION` Moves the `description` field from the `rust` section to the `build` section as it can be useful for tools and is not specific to rustc. Also passes this value to tool builds through the `CFG_VER_DESCRIPTION` env. Motivated from https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Propagate.20rust.2Edescription.20to.20tools.20in.20dist.20build

`CFG_VER_DESCRIPTION` is descriptive string to be appended to version output. This is usually set by the bootstrap in rust-lang/rust. Useful for showing vendor build information. See <rust-lang/rust#137723>.

### What does this PR try to resolve? `CFG_VER_DESCRIPTION` is descriptive string to be appended to version output. This is usually set by the bootstrap in rust-lang/rust. Useful for showing vendor build information. See <rust-lang/rust#137723>. ### How should we test and review this PR? ```bash CFG_VER_DESCRIPTION="My Awesome Rust Distribution" cargo b target/debug/cargo version ```

https://blog.rust-lang.org/2025/05/15/Rust-1.87.0/ * Switch to LLVM 20 rust-lang/rust#135763 * Moved `rust.description` to `build.description` rust-lang/rust#137723 * Mark extern block in unwind as unsafe rust-lang/rust@a4e7f8f

[ commit 0f1b82d3d5d795df14cf8f592f19e09f8498e081 ] https://blog.rust-lang.org/2025/05/15/Rust-1.87.0/ * Switch to LLVM 20 rust-lang/rust#135763 * Moved `rust.description` to `build.description` rust-lang/rust#137723 * Mark extern block in unwind as unsafe rust-lang/rust@a4e7f8f

rustbot assigned Mark-Simulacrum Feb 27, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 27, 2025

jieyouxu reviewed Feb 27, 2025

View reviewed changes

config.example.toml Outdated Show resolved Hide resolved

rustbot assigned emilyalbini and unassigned Mark-Simulacrum Feb 27, 2025

weihanglo approved these changes Feb 27, 2025

View reviewed changes

jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 27, 2025

onur-ozkan force-pushed the cfg-ver-description branch from c4dc747 to f877b12 Compare February 27, 2025 16:00

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 27, 2025

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 27, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 27, 2025

matthiaskrgr mentioned this pull request Feb 28, 2025

Rollup of 11 pull requests #137775

Closed

matthiaskrgr mentioned this pull request Mar 1, 2025

Rollup of 9 pull requests #137839

Closed

onur-ozkan added 4 commits March 5, 2025 08:38

move rust.description to build.description

31e612b

Signed-off-by: onur-ozkan <work@onurozkan.dev>

add change-entry

92956e8

Signed-off-by: onur-ozkan <work@onurozkan.dev>

pass CFG_VER_DESCRIPTION to tool builds

853e34d

Signed-off-by: onur-ozkan <work@onurozkan.dev>

replace rust.description with build.description

9646c2f

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the cfg-ver-description branch from 0f7da1a to 9646c2f Compare March 5, 2025 05:40

workingjubilee mentioned this pull request Mar 5, 2025

Rollup of 25 pull requests #138044

Closed

jieyouxu mentioned this pull request Mar 5, 2025

Rollup of 20 pull requests #138058

Merged

bors merged commit dac4ffd into rust-lang:master Mar 5, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Mar 5, 2025

weihanglo mentioned this pull request Mar 5, 2025

feat: show extra build description from bootstrap rust-lang/cargo#15269

Merged

onur-ozkan deleted the cfg-ver-description branch March 5, 2025 20:26

Uh oh!

Conversation

onur-ozkan commented Feb 27, 2025

Uh oh!

rustbot commented Feb 27, 2025

Uh oh!

rustbot commented Feb 27, 2025

Uh oh!

Uh oh!

emilyalbini commented Feb 27, 2025

Uh oh!

weihanglo left a comment

Choose a reason for hiding this comment

Uh oh!

onur-ozkan commented Feb 27, 2025

Uh oh!

bors commented Feb 27, 2025

Uh oh!

bors commented Feb 27, 2025

Uh oh!

cuviper commented Feb 27, 2025

Uh oh!

onur-ozkan commented Feb 27, 2025

Uh oh!

onur-ozkan commented Feb 27, 2025

Uh oh!

bors commented Feb 27, 2025

Uh oh!

bors commented Feb 27, 2025

Uh oh!

weihanglo commented Mar 5, 2025

Uh oh!

jieyouxu commented Mar 5, 2025

Uh oh!

bors commented Mar 5, 2025

Uh oh!

bors commented Mar 5, 2025

Uh oh!

workingjubilee commented Mar 5, 2025

Uh oh!

onur-ozkan commented Mar 5, 2025

Uh oh!

workingjubilee commented Mar 5, 2025

Uh oh!

bors commented Mar 5, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants