Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap: cargo-miri is called "cargomiri" for check builds #131592

Closed
RalfJung opened this issue Oct 12, 2024 · 4 comments · Fixed by #131597
Closed

Bootstrap: cargo-miri is called "cargomiri" for check builds #131592

RalfJung opened this issue Oct 12, 2024 · 4 comments · Fixed by #131597
Labels
C-enhancement Category: An issue proposing an enhancement or a PR with one. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Comments

@RalfJung
Copy link
Member

When I do ./x.py check, it says:

Checking stage0 cargomiri artifacts (x86_64-unknown-linux-gnu)

Strangely, when I do ./x.py test miri, it uses the correct name:

Building tool cargo-miri (stage0 -> stage1, x86_64-unknown-linux-gnu)

No idea how it is even possible for this tool to have two different names inside bootstrap...

@RalfJung RalfJung added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 12, 2024
@rustbot rustbot added the needs-triage This issue may need triage. Remove it if it has been sufficiently triaged. label Oct 12, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Oct 12, 2024

I think this is just because cargo-miri's tool check step is generated through a macro

tool_check_step!(CargoMiri, "src/tools/miri/cargo-miri", SourceType::InTree);

this macro generates the check message via

let _guard = builder.msg_check(&concat!(stringify!($name), " artifacts").to_lowercase(), target);

there's a to_lowercase in there too. The build step has a different name because that macro explicitly asks for a display name

CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", stable=false, add_bins_to_sysroot = ["cargo-miri"];

@jieyouxu jieyouxu added C-bug Category: This is a bug. and removed needs-triage This issue may need triage. Remove it if it has been sufficiently triaged. labels Oct 12, 2024
@jieyouxu
Copy link
Member

If I make the macro use a display name,

Checking stage0 cargo-miri artifacts (x86_64-pc-windows-msvc)

@RalfJung
Copy link
Member Author

Ah, I didn't realize those two steps were defined entirely independently.

@jieyouxu
Copy link
Member

Anyway, #131597 should make this more consistent.

@jieyouxu jieyouxu added C-enhancement Category: An issue proposing an enhancement or a PR with one. and removed C-bug Category: This is a bug. labels Oct 12, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this issue Oct 12, 2024
…bzol

Take a display name for `tool_check_step!`

The tool build step already takes a display name, make the tool check step also take a display name to better represent the tool name. I.e. instead of `src/tools/cargo-miri` becoming `cargomiri`, it now becomes `cargo-miri`.

Fixes rust-lang#131592.
@bors bors closed this as completed in 1e0c5ff Oct 12, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this issue Oct 12, 2024
Rollup merge of rust-lang#131597 - jieyouxu:explicit-check-name, r=Kobzol

Take a display name for `tool_check_step!`

The tool build step already takes a display name, make the tool check step also take a display name to better represent the tool name. I.e. instead of `src/tools/cargo-miri` becoming `cargomiri`, it now becomes `cargo-miri`.

Fixes rust-lang#131592.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-enhancement Category: An issue proposing an enhancement or a PR with one. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants