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

Update RLS and Rustfmt #56111

Merged
merged 1 commit into from
Nov 20, 2018
Merged

Update RLS and Rustfmt #56111

merged 1 commit into from
Nov 20, 2018

Conversation

nrc
Copy link
Member

@nrc nrc commented Nov 20, 2018

Re-opening #56061

@bors: r=kennytm p=2

Closes #55966
Closes #55965

@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 20, 2018
@nrc nrc assigned kennytm and unassigned aturon Nov 20, 2018
@nrc
Copy link
Member Author

nrc commented Nov 20, 2018

@bors: r=kennytm p=2

@bors
Copy link
Contributor

bors commented Nov 20, 2018

📌 Commit 9b96ca2 has been approved by kennytm

@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
@nikomatsakis nikomatsakis mentioned this pull request Nov 20, 2018
20 tasks
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 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.
travis_time:end:0034051e:start=1542742010643162847,finish=1542742011685774288,duration=1042611441
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-5.0
---
############################################################              83.3%
######################################################################## 100.0%
[00:02:13] extracting /checkout/obj/build/cache/2018-10-30/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:02:13]     Updating crates.io index
[00:02:20] error: the lock file /checkout/src/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:20] Build completed unsuccessfully in 0:00:19
[00:02:20] Makefile:81: recipe for target 'prepare' failed
[00:02:20] make: *** [prepare] Error 1
[00:02:21] Command failed. Attempt 2/5:
[00:02:21] Command failed. Attempt 2/5:
[00:02:21]     Updating crates.io index
[00:02:21] error: the lock file /checkout/src/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:21] Build completed unsuccessfully in 0:00:00
[00:02:21] make: *** [prepare] Error 1
[00:02:21] Makefile:81: recipe for target 'prepare' failed
[00:02:23] Command failed. Attempt 3/5:
[00:02:23] Command failed. Attempt 3/5:
[00:02:23]     Updating crates.io index
[00:02:24] error: the lock file /checkout/src/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:24] Build completed unsuccessfully in 0:00:00
[00:02:24] Makefile:81: recipe for target 'prepare' failed
[00:02:24] make: *** [prepare] Error 1
[00:02:27] Command failed. Attempt 4/5:
[00:02:27] Command failed. Attempt 4/5:
[00:02:27]     Updating crates.io index
[00:02:27] error: the lock file /checkout/src/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:27] Build completed unsuccessfully in 0:00:00
[00:02:27] make: *** [prepare] Error 1
[00:02:27] Makefile:81: recipe for target 'prepare' failed
[00:02:31] Command failed. Attempt 5/5:
[00:02:31] Command failed. Attempt 5/5:
[00:02:31]     Updating crates.io index
[00:02:31] error: the lock file /checkout/src/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:31] Build completed unsuccessfully in 0:00:00
2616272 .
1145776 ./src
781828 ./.git

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)

@nrc
Copy link
Member Author

nrc commented Nov 20, 2018

@bors: r=kennytm p=2

@bors
Copy link
Contributor

bors commented Nov 20, 2018

📌 Commit 595bea6 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Nov 20, 2018

⌛ Testing commit 595bea6 with merge f1e2fa8...

bors added a commit that referenced this pull request Nov 20, 2018
Update RLS and Rustfmt

Re-opening #56061

@bors: r=kennytm p=2
This was referenced Nov 20, 2018
@alexcrichton alexcrichton added this to the Rust 2018 Release milestone Nov 20, 2018
@bors
Copy link
Contributor

bors commented Nov 20, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing f1e2fa8 to master...

bors added a commit that referenced this pull request Nov 20, 2018
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)
@bors bors merged commit 595bea6 into rust-lang:master Nov 20, 2018
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.

6 participants