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

Add temporary renames to manifests for rustfmt/clippy #56081

Merged
merged 1 commit into from
Nov 20, 2018
Merged

Add temporary renames to manifests for rustfmt/clippy #56081

merged 1 commit into from
Nov 20, 2018

Conversation

alexcrichton
Copy link
Member

This will be part of our strategy for shipping renamed versions of these
components for the Rust 2018 edition.

Closes #55967

@alexcrichton
Add temporary renames to manifests for rustfmt/clippy
3c67ed4 
This will be part of our strategy for shipping renamed versions of these
components for the Rust 2018 edition.

Closes rust-lang#55967
@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 Nov 19, 2018
@alexcrichton
Copy link
Member Author

r? @nrc

Note that I'm flagging this as closing #55967 as I'm thinking it's probably best to track the profile changes elsewhere now?

@rust-highfive rust-highfive assigned nrc and unassigned nikomatsakis Nov 19, 2018
@nrc
Copy link
Member

nrc commented Nov 20, 2018

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Nov 20, 2018

📌 Commit 3c67ed4 has been approved by nrc

@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 Nov 20, 2018
@bors
Copy link
Contributor

bors commented Nov 20, 2018

⌛ Testing commit 3c67ed4 with merge 5450bb0fb68679557c9c0ea1a11c2b4b12bc9e0f...

@bors
Copy link
Contributor

bors commented Nov 20, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job dist-aarch64-linux of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
[00:06:15]    Compiling proc_macro v0.0.0 (/checkout/src/libproc_macro)
[00:06:25] [RUSTC-TIMING] proc_macro test:false 9.250
[00:06:25]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:06:46] [RUSTC-TIMING] syntax_ext test:false 21.325
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 20, 2018
@kennytm
Copy link
Member

kennytm commented Nov 20, 2018

@bors retry travis-ci/travis-ci#9696

@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 Nov 20, 2018
@bors
Copy link
Contributor

bors commented Nov 20, 2018

⌛ Testing commit 3c67ed4 with merge 7a0cef7...

bors added a commit that referenced this pull request Nov 20, 2018
@bors
Auto merge of #56081 - alexcrichton:update-manifest, r=nrc
7a0cef7 
Add temporary renames to manifests for rustfmt/clippy

This will be part of our strategy for shipping renamed versions of these
components for the Rust 2018 edition.

Closes #55967
@bors
Copy link
Contributor

bors commented Nov 20, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing 7a0cef7 to master...

@bors bors merged commit 3c67ed4 into rust-lang:master Nov 20, 2018
@nrc nrc added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 20, 2018
@nrc
Copy link
Member

nrc commented Nov 20, 2018

@alexcrichton are you able to backport to beta please?

@alexcrichton alexcrichton deleted the update-manifest branch November 20, 2018 19:54
@alexcrichton
Copy link
Member Author

er oops should have already tagged, yep can take care of it!

@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 20, 2018
@nikomatsakis nikomatsakis mentioned this pull request Nov 20, 2018
Merged
20 tasks
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 20, 2018
bors added a commit that referenced this pull request Nov 20, 2018
@bors
Auto merge of #56102 - nikomatsakis:beta, r=alexcrichton
4b3a1d9 
beta backport rollup

Backports of some beta-approved PRs

- [x] #55385: NLL: cast causes failure to promote to static
- [x] #56043: remove "approx env bounds" if we already know from trait
- [x] #56003: do not propagate inferred bounds on trait objects if they involve `Self`
- [x] #55852: Rewrite `...` as `..=` as a `MachineApplicable` 2018 idiom lint
- [x] #55804: rustdoc: don't inline `pub use some_crate` unless directly asked to
- [x] #56059: Increase `Duration` approximate equal threshold to 1us
- [x]  Keep resolved defs in path prefixes and emit them in save-analysis #54145
- [x]  Adjust Ids of path segments in visibility modifiers #55487
- [x]  save-analysis: bug fix and optimisation. #55521
- [x]   save-analysis: be even more aggressive about ignorning macro-generated defs #55936
- [x]  save-analysis: fallback to using path id #56060
- [x]  save-analysis: Don't panic for macro-generated use globs #55879
- [x]  Add temporary renames to manifests for rustfmt/clippy #56081
- [x] Revert #51601 #56049
- [x]  Fix stability hole with `static _` #55983
- [x] #56077
- [x] Fix Rustdoc ICE when checking blanket impls #55258
- [x]  Updated RELEASES.md for 1.31.0 #55678
- [x] ~~#56061~~ #56111
- [x]  Stabilize `extern_crate_item_prelude` #56032

Still running tests locally, and I plan to backport @nrc's other PRs too

(cc @petrochenkov -- thanks for the advice)
@phansch phansch mentioned this pull request Dec 21, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexcrichton @rust-highfive @nrc @bors @kennytm @nikomatsakis