search

rust-lang / miri

An interpreter for Rust's mid-level intermediate representation
Apache License 2.0
4.31k stars 327 forks source link

Rustup, fix rustdoc sysroot issue #3409

Closed RalfJung closed 5 months ago

RalfJung commented 5 months ago

This uses a different approach to resolve https://github.com/rust-lang/miri/issues/3404: we entirely move the responsibility of setting miri-sysroot to whatever invokes the Miri driver. cargo-miri knows whether it is inside rustdoc or not and can adjust accordingly. I previously avoided doing that because there are a bunch of places that are invoking the driver (cargo-miri, the ui test suite, ./miri run, ./x.py run miri) and they all need to be adjusted now. But it is also somewhat less fragile as we usually have more information there -- and we can just decide that ./miri run file.rs --sysroot path is not supported.

RalfJung commented 5 months ago

@bors r+

bors commented 5 months ago

:pushpin: Commit d23df545a4403708a4dfea2f6285f51a4c551e23 has been approved by RalfJung

It is now in the queue for this repository.

bors commented 5 months ago

:hourglass: Testing commit d23df545a4403708a4dfea2f6285f51a4c551e23 with merge 5e9a025ef173c5e8df83d5fecb3114413fcf002f...

bors commented 5 months ago

:broken_heart: Test failed - checks-actions

RalfJung commented 5 months ago

Closing in favor of https://github.com/rust-lang/miri/pull/3411 which is just the cargo-miri changes without the rustup. (That won't make it work, but it makes more sense to keep that around as a draft.)