Skip to content

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

Merged
merged 3 commits into from
Jul 13, 2021

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jul 9, 2021

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, and extended=true, to skip rust-analyzer. But I neglected to update the install part to also ignore it.

Fixes #86999

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 9, 2021
@rust-log-analyzer

This comment has been minimized.

@RalfJung
Copy link
Member

The same should probably be done for Miri?

@ehuss
Copy link
Contributor Author

ehuss commented Jul 10, 2021

Miri already checks if it isn't built (here), or maybe I am misunderstanding?

@RalfJung
Copy link
Member

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.

@ehuss
Copy link
Contributor Author

ehuss commented Jul 10, 2021

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.

@RalfJung
Copy link
Member

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.

@ehuss
Copy link
Contributor Author

ehuss commented Jul 11, 2021

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.

@ehuss ehuss added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 11, 2021
@apiraino apiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 11, 2021
@Mark-Simulacrum
Copy link
Member

r=me with the last comment resolved (likely by similar logic to what's added for rust-analyzer)

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 12, 2021

📌 Commit 166c147 has been approved by Mark-Simulacrum

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 12, 2021
@Mark-Simulacrum Mark-Simulacrum added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 12, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 13, 2021
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
@bors bors merged commit 2d9a038 into rust-lang:master Jul 13, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 13, 2021
pld-gitsync pushed a commit to pld-linux/rust that referenced this pull request Jul 14, 2021
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
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 22, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.55.0, 1.54.0 Jul 22, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2021
…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
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

thread 'main' panicked at 'missing rust-analyzer', src/bootstrap/install.rs:170:14
8 participants