Update RLS and Rustfmt #51407
Merged
Update RLS and Rustfmt #51407
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ p=15 |
|
📌 Commit acd4fe8 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit acd4fe8 with merge 021731b444a3b475dc56b01f77d9541d5e0ddad9... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
@bors: retry |
bors
added
S-waiting-on-bors
|
⌛ Testing commit acd4fe8 with merge 39df8d6634394e9e1e03be54da0a1ceae616d6d9... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
@bors retry |
bors
added
S-waiting-on-bors
|
⌛ Testing commit acd4fe8 with merge e984b041a671b59978e255f58ffe4faa6bedbb57... |
|
💔 Test failed - status-travis |
This comment has been minimized.
This comment has been minimized.
bors
added
S-waiting-on-review
|
@bors: retry |
bors
added
S-waiting-on-bors
|
⌛ Testing commit acd4fe8 with merge 6136e72631b257f333edbc3cf9fa0162f43e966b... |
|
(Note: Please don't retry if this failed again, I'm gonna roll this up) |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
The job Click to expand the log.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 |
|
@bors treeclosed=30 retry |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Jun 7, 2018
Update RLS and Rustfmt r? @Mark-Simulacrum Fixes tests
bors
added a commit
that referenced
this pull request
Jun 7, 2018
Rollup of 9 pull requests Successful merges: - #51186 (Remove two redundant .nll.stderr files) - #51283 (Deny #[cfg] and #[cfg_attr] on generic parameters.) - #51368 (Fix the use of closures within #[panic_implementation]) - #51380 (Remove dependency on fmt_macros from typeck) - #51389 (rustdoc: Fix missing stability and src links for inlined external macros) - #51399 (NLL performance boost) - #51407 (Update RLS and Rustfmt) - #51417 (Revert #49719) - #51420 (Tries to address the recent network issues) Failed merges:
semarie
reviewed
Jul 2, 2018
| "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| "rls-vfs 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| "rustfmt-nightly 0.8.2", | ||
| "rustfmt-nightly 0.8.2 (git+https://github.com/rust-lang-nursery/rustfmt?rev=f3906267)", |
There was a problem hiding this comment.
I am unsure if related, but currently I am unable to build beta (or nightly) from tarball using vendor=true due to network dependency (git) on rustfmt:
running: /usr/local/bin/cargo build --manifest-path /data/semarie/build-rust/build_dir/rustc-beta-src/src/bootstrap/Cargo.toml --frozen
Updating git repository `https://github.com/rust-lang-nursery/rustfmt`
error: failed to load source for a dependency on `rustfmt-nightly`
Caused by:
Unable to update https://github.com/rust-lang-nursery/rustfmt?rev=f3906267#f3906267
Caused by:
failed to fetch into /data/semarie/build-rust/install_dir/crates/git/db/rustfmt-5390e0ead582d971
Caused by:
attempting to update a git repository, but --frozen was specified
Traceback (most recent call last):
File "/data/semarie/build-rust/build_dir/rustc-beta-src/x.py", line 20, in <module>
bootstrap.main()
File "/data/semarie/build-rust/build_dir/rustc-beta-src/src/bootstrap/bootstrap.py", line 827, in main
bootstrap(help_triggered)
File "/data/semarie/build-rust/build_dir/rustc-beta-src/src/bootstrap/bootstrap.py", line 806, in bootstrap
build.build_bootstrap()
File "/data/semarie/build-rust/build_dir/rustc-beta-src/src/bootstrap/bootstrap.py", line 633, in build_bootstrap
run(args, env=env, verbose=self.verbose)
File "/data/semarie/build-rust/build_dir/rustc-beta-src/src/bootstrap/bootstrap.py", line 148, in run
raise RuntimeError(err)
RuntimeError: failed to run: /usr/local/bin/cargo build --manifest-path /data/semarie/build-rust/build_dir/rustc-beta-src/src/bootstrap/Cargo.toml --frozen
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @Mark-Simulacrum
Fixes tests