ship tools with sysroot

[onur-ozkan]

Provides tool binaries under the sysroot which can be used/tested with cargo +custom-toolchain $tool

Clippy and fmt works without any problem.

But can't say the same for miri:

  ~/devspace/.other/chunk-list  stable $ cargo +stage2 miri setup
Running `"rustup" "component" "add" "rust-src"` to install the `rust-src` component for the selected toolchain.
error: stage2 is a custom toolchain
fatal error: failed to install the `rust-src` component for the selected toolchain

it's looking for $sysroot/lib/rustlib/src/rust/library and that simply doesn't exists for x build.

cc @jyn514 (I thought you might be interested on this, since you did few review iterations on previous PRs of adding tools to sysroot)

--

Update

Now we are able to use miri as well.

After running x b miri cargo-miri --stage 2, I am able to run cargo +stage2 miri setup which works as expected.

Resolves #110625
Resolves #97762
Resolves #81431

[rustbot]

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

[onur-ozkan]

I decided to write tests for this @rustbot author

[jyn514]

it's looking for $sysroot/lib/rustlib/src/rust/library and that simply doesn't exists for x build.

it should be possible to add this, right? We can make a symlink from rust to the root of the repository. I thought we already did that today actually but maybe I'm thinking of something else.

[onur-ozkan]

it should be possible to add this, right? We can make a symlink from rust to the root of the repository.

I wasn't sure if we should do it or not, will do it then.

I don't know how this error didn't raise on the previous PR.

[onur-ozkan]

I decided to write tests for this

This turns out not to be worth doing it. It will require quite some time for just checking if the binaries are in the correct place after x b $tool command which requires compilation. I think it's worth adding this one into #102563 which I will start start working on that soon.

[onur-ozkan]

cargo +stage2 miri test gives the following in simple cargo project:

  ~/devspace/.other/chunk-list  stable $ cargo +stage2 miri test
Preparing a sysroot for Miri (target: x86_64-unknown-linux-gnu)... done
thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: CargoMetadata { stderr: "error: the `-Z` flag is only accepted on the nightly channel of Cargo, but this is the `stable` channel\nSee https://doc.rust-lang.org/book/appendix-07-nightly-rust.html for more information about Rust release channels.\n" }', src/tools/miri/cargo-miri/src/util.rs:224:80
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

Which seems like an expected result if I am not mistaken?

[jyn514]

Try installing nightly cargo so it gets further (rustup install nightly), or set RUSTC_BOOTSTRAP=1 so the stable cargo works.

[onur-ozkan]

Try installing nightly cargo so it gets further (rustup install nightly), or set RUSTC_BOOTSTRAP=1 so the stable cargo works.

OOps. Why I didn't do that lol.

here we go:

  ~/devspace/.other/chunk-list  stable $ cargo +stage2 miri test
Preparing a sysroot for Miri (target: x86_64-unknown-linux-gnu)... done
   Compiling chunk-list v0.1.0 (/home/nimda/devspace/.other/chunk-list)
    Finished test [unoptimized + debuginfo] target(s) in 0.06s
     Running unittests src/main.rs (target/miri/x86_64-unknown-linux-gnu/debug/deps/chunk_list-b3b731111ba842c5)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

[jyn514]

this looks amazing! r=me after a rebase :)

[onur-ozkan]

@bors r=jyn514 rollup

[bors]

📌 Commit 68fc568 has been approved by jyn514

It is now in the queue for this repository.