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

Don't dist miri or rust-analyzer on stable or beta. #86568

Merged
merged 2 commits into from
Jun 28, 2021

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 23, 2021

This prevents miri and rust-analyzer from being built for "dist" or "install" on the stable/beta channels. It is a nightly-only tool and should not be included.

Closes #86286

@rust-highfive
Copy link
Collaborator

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 Jun 23, 2021
@RalfJung
Copy link
Member

Thanks!

Do we have any other nightly-only tools?

@pietroalbini
Copy link
Member

rust-analyzer-preview is also nightly-only.

@Urgau
Copy link
Member

Urgau commented Jun 23, 2021

Do we have any other nightly-only tools?

Any things that is *-preview ?
screenshot
Taken from: rust-1.53.0-x86_64-unknown-linux-gnu.tar.gz

@pietroalbini
Copy link
Member

Not really, the only nightly-only components are miri-preview and rust-analyzer-preview.

@Urgau
Copy link
Member

Urgau commented Jun 23, 2021

Not really, the only nightly-only components are miri-preview and rust-analyzer-preview.

Yea, my bad, but it's also seems that rustc-codegen-cranelift-preview is also a nightly-only component.

If nightly-only components are preview but not all preview components are nightly-only, what does the preview means ?

@Mark-Simulacrum Mark-Simulacrum added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 23, 2021
@ehuss
Copy link
Contributor Author

ehuss commented Jun 23, 2021

I added rust-analyzer.

If nightly-only components are preview but not all preview components are nightly-only, what does the preview means ?

I believe the components start as "preview", but due to some renaming issue in rustup, there is a "renames" table in the manifest to drop the preview. I don't recall the exact reason it does it that way, possibly due to backwards compatibility?

@ehuss ehuss changed the title Don't dist miri on stable or beta. Don't dist miri or rust-analyzer on stable or beta. Jun 23, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 28, 2021

📌 Commit 6aa79a3 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 Jun 28, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 28, 2021
Rollup of 6 pull requests

Successful merges:

 - rust-lang#86206 (Fix type checking of return expressions outside of function bodies)
 - rust-lang#86358 (fix pretty print for `loop`)
 - rust-lang#86568 (Don't dist miri or rust-analyzer on stable or beta.)
 - rust-lang#86683 (:arrow_up: rust-analyzer)
 - rust-lang#86687 (Allow anyone to set `perf-regression` label)
 - rust-lang#86688 (Add a regression test for issue-65384)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit daa3ceb into rust-lang:master Jun 28, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 28, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.55.0, 1.54.0 Jul 3, 2021
@Mark-Simulacrum
Copy link
Member

(Bumping milestone to 1.54 -- this was backported in #86413

@boklm
Copy link

boklm commented Jul 9, 2021

I backported the two patches from this pull request to 1.53.0 (trying to fix #86436), but now the build fails with:

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

@Mark-Simulacrum
Copy link
Member

Please file a new issue for that - looks like x.py install likely needs to be similarly updated like in this PR, and that just hasn't happened yet.

@ehuss ehuss added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 11, 2021
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 11, 2021
@Mark-Simulacrum
Copy link
Member

Dropping beta-nominated; this was already backported in #86413

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 12, 2021
…Mark-Simulacrum

Fix rust-analyzer install when not available.

This changes it so that `x.py install` won't fail if rust-analyzer isn't available. This was changed in rust-lang#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 rust-lang#86999
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Miri is shipped in the standalone installer
9 participants