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

Restore the rustc_plugin crate in the sysroot #63736

Merged
merged 1 commit into from Aug 20, 2019
Merged

Conversation

SimonSapin
Copy link
Contributor

It was accidentally removed in a rebase of #62727

Fixes #63729 (rls build failure)

It was accidentally removed in a rebase of rust-lang#62727

Fixes rust-lang#63729
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 Aug 20, 2019
@SimonSapin
Copy link
Contributor Author

@bors p=5 for tool fix, landing ideally before the next Nightly

@mati865
Copy link
Contributor

mati865 commented Aug 20, 2019

cc @petrochenkov

@eddyb
Copy link
Member

eddyb commented Aug 20, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Aug 20, 2019

📌 Commit c561abe has been approved by eddyb

@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 Aug 20, 2019
@Centril
Copy link
Contributor

Centril commented Aug 20, 2019

Setting p=5 on PRs just because of tool updates just messes with my ability to manage the queue; @bors p=0

Centril added a commit to Centril/rust that referenced this pull request Aug 20, 2019
Restore the rustc_plugin crate in the sysroot

It was accidentally removed in a rebase of rust-lang#62727

Fixes rust-lang#63729 (rls build failure)
@SimonSapin
Copy link
Contributor Author

Sorry, is queue management etiquette documented somewhere?

@Centril
Copy link
Contributor

Centril commented Aug 20, 2019

I don't believe so.

@SimonSapin
Copy link
Contributor Author

It doesn’t seem reasonable to expect people to follow unwritten rules they have no way to be aware of.

@Centril
Copy link
Contributor

Centril commented Aug 20, 2019

@SimonSapin Just don't assign random high priorities unless there's a high degree of urgency (e.g. a stabilization PR where we are closed to the master=>beta cutoff, some CI problem that must be fixed immediately, or making a new release) (and tool updates missing a nightly are not urgent). If you want to signal that something is a bit important then use p=1 and that's enough for me to see it. (Tho I don't think tool fixes should leap ahead in the queue personally.)

@nox
Copy link
Contributor

nox commented Aug 20, 2019

a high degree of urgency

Missing RLS should be considered a high degree of urgency.

Centril added a commit to Centril/rust that referenced this pull request Aug 20, 2019
Restore the rustc_plugin crate in the sysroot

It was accidentally removed in a rebase of rust-lang#62727

Fixes rust-lang#63729 (rls build failure)
Centril added a commit to Centril/rust that referenced this pull request Aug 20, 2019
Restore the rustc_plugin crate in the sysroot

It was accidentally removed in a rebase of rust-lang#62727

Fixes rust-lang#63729 (rls build failure)
bors added a commit that referenced this pull request Aug 20, 2019
Rollup of 7 pull requests

Successful merges:

 - #63216 (avoid unnecessary reservations in std::io::Take::read_to_end)
 - #63265 (Implement `nth_back` for ChunksExactMut)
 - #63691 (Fix bug in iter::Chain::size_hint)
 - #63722 (Don't use stage naming in RUSTFLAGS environment variables)
 - #63723 (Consolidate sigemptyset workarounds)
 - #63736 (Restore the rustc_plugin crate in the sysroot)
 - #63743 (Allow git to merge `Cargo.lock`)

Failed merges:

r? @ghost
@bors bors merged commit c561abe into rust-lang:master Aug 20, 2019
@SimonSapin SimonSapin deleted the plugin branch August 22, 2019 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

rls no longer builds after rust-lang/rust#62727
8 participants