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.

Sign up for GitHub

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

Jump to bottom

[beta] bootstrap; remove redundant imports. #60273

Merged
merged 1 commit into from
Apr 27, 2019
Merged

[beta] bootstrap; remove redundant imports. #60273

merged 1 commit into from
Apr 27, 2019

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Apr 25, 2019

This is a backport of d6cc855 for fixing #60265

r? @Centril

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 25, 2019
@tesuji
Copy link
Contributor

tesuji commented Apr 25, 2019

Hmm. Something is really wrong to me. This PR looks really different to #59974.
You might want to cherry-pick those commits from #59974.

@Keruspe
Copy link
Contributor Author

Keruspe commented Apr 25, 2019

This is a cherry pick of the relevant commit from this PR, how does it look wrong to you?

@tesuji
Copy link
Contributor

tesuji commented Apr 25, 2019

@Keruspe Do we need this commit: 531a9bd?

@Keruspe
Copy link
Contributor Author

Keruspe commented Apr 25, 2019

For the 1.35 beta? Nope, on the contrary

@tesuji
Copy link
Contributor

tesuji commented Apr 25, 2019

I surely don't understand the release process of rustc. Sorry if I bother you.

@Centril
Copy link
Contributor

Centril commented Apr 25, 2019

r? @pietroalbini

@pietroalbini
Copy link
Member

Hmm, why is this needed? We usually bootstrap the beta with the latest stable.

Also, all beta backports have to be approved by a team (in this case I think infra since it involves rustbuild?), so I can't merge this yet.

@rustbot modify labels: S-blocked -S-waiting-on-review

@rustbot rustbot added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 25, 2019
@Centril
Copy link
Contributor

Centril commented Apr 25, 2019

@pietroalbini Was approved in #59974 (comment) if t-compiler suffices.

@pietroalbini
Copy link
Member

pietroalbini commented Apr 25, 2019 •
edited
Loading

Hmm, yeah, didn't see that. I'll take a look tomorrow.

@rustbot modify labels: -S-blocked S-waiting-on-review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Apr 25, 2019
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Apr 26, 2019
Closed
@Mark-Simulacrum
Copy link
Member

This looks fine to me. We should strive to support distro's efforts to self-bootstrap so long as the changes don't impact us significantly (and this appears to work for us).

@pietroalbini
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Apr 26, 2019

📌 Commit cdcab96 has been approved by pietroalbini

@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 Apr 26, 2019
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Apr 26, 2019
@pietroalbini
Rollup merge of rust-lang#60273 - Keruspe:beta, r=pietroalbini
e793a2f
@pietroalbini pietroalbini mentioned this pull request Apr 26, 2019
Merged
bors added a commit that referenced this pull request Apr 27, 2019
@bors
Auto merge of #60311 - pietroalbini:beta-rollup, r=pietroalbini
c13114d 
[beta] Rollup backports

Cherry-picked:

* #59886:  musl: do not compress debug section
* #59891:  Fix the link to sort_by_cached_key
* #59911: Revert "compile crates under test w/ -Zemit-stack-sizes"
* #59978: rustdoc: Remove default keyword from re-exported trait methods
* #59989: Fix links to Atomic* in RELEASES.md
* #60186: Temporarily accept [i|u][32|size] suffixes on a tuple index and warn
* #60309: Add 1.34.1 release notes

Rolled up:

* #60273: [beta] bootstrap; remove redundant imports.

r? @ghost
@bors bors merged commit cdcab96 into rust-lang:beta Apr 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pietroalbini pietroalbini

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Keruspe @rust-highfive @tesuji @Centril @pietroalbini @Mark-Simulacrum @bors @rustbot