-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Fix rust-analyzer install when not available. #87007
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Conversation
(rust-highfive has picked a reviewer for you, use r? to override) |
This comment has been minimized.
This comment has been minimized.
efa1db7
to
f698cac
Compare
The same should probably be done for Miri? |
Miri already checks if it isn't built (here), or maybe I am misunderstanding? |
I have no idea how any of that code works.^^ I just figured the nightly-only tools would all need similar changes. In particular, even when people build with tools enabled, on beta/stable they should not get Miri. I am not sure if that is already the case or requires further changes. |
Ah, yea, miri was already working correctly, just rust-analyzer was out of sync. Miri is not built for dist/install on beta/stable when tools are enabled. |
Hm, but we still got bug reports until very recently from people that accidentally built Miri on stable: #86981. So unless this changed recently, something doesn't seem to work as intended. |
The fix for that in #86568 is not on beta, yet. It looks like it was tagged with beta-accepted, but was missing beta-nominated. There's a 3-stage progression (beta-nominated, beta-nominated+beta-accepted, beta-accepted). I'm not sure why Mark tagged it skipping the second stage. I added the missing tag, hopefully it'll get picked up in the next beta rollup. |
r=me with the last comment resolved (likely by similar logic to what's added for rust-analyzer) |
@bors r+ |
📌 Commit 166c147 has been approved by |
Rollup of 11 pull requests Successful merges: - rust-lang#86344 (Split MaybeUninit::write into new feature gate and stabilize it) - rust-lang#86811 (Remove unstable `io::Cursor::remaining`) - rust-lang#86846 (stdio_locked: add tracking issue) - rust-lang#86887 (rustdoc: remove dead code in `clean`) - rust-lang#87007 (Fix rust-analyzer install when not available.) - rust-lang#87035 (Fix implementors display) - rust-lang#87065 (Fix ICE with unsized type in const pattern) - rust-lang#87070 (Simplify future incompatible reporting.) - rust-lang#87077 (:arrow_up: rust-analyzer) - rust-lang#87078 (Rustdoc: suggest removing disambiguator if linking to field) - rust-lang#87089 (CTFE engine: small cleanups) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
miri fails if there's no git repository anywhere in directory tree however miri and rust-analyzer were not supposed to be built on stable channel in the first place: rust-lang/rust#86568 rust-lang/rust#87007
…ulacrum [beta] backports Backports: * Move assert_matches to an inner module rust-lang#86947 * rename assert_matches module rust-lang#87195 * Fix rust-analyzer install when not available. rust-lang#87007
This changes it so that
x.py install
won't fail if rust-analyzer isn't available. This was changed in #86568 to handle the case where installing on stable/beta, andextended=true
, to skip rust-analyzer. But I neglected to update the install part to also ignore it.Fixes #86999