Rollup of 3 pull requests #49221
Merged
Rollup of 3 pull requests #49221
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
Member
kennytm
commented
Mar 20, 2018
kennytm
commented
- Successful merges: Update clap #49182, Fix ordering of auto-generated trait bounds in rustdoc output #49196, Apply temporary fix of travis-ci/dpl#788. #49217
- Failed merges:
While the order of the where clauses was deterministic, the ordering of bounds and lifetimes was not. This made the order flip- flop randomly when new traits and impls were added to libstd. This PR makes the ordering of bounds and lifetimes deterministic, and re-enables the test that was causing the issue. Fixes rust-lang#49123
This should fix regressions in Cargo after swithing to clap: * If an external subcommand name was close to built-in one, clap errored (fixed by updating clap version) * External subcomands didn't received their name as a first arg
Update clap This should fix a regression in Cargo after swithing to clap, when an external subcommand was not discovered, if its name was close to a built in command. bug report: rust-lang#48986 (comment) fix: clap-rs/clap#1215
…ions, r=QuietMisdreavus Fix ordering of auto-generated trait bounds in rustdoc output While the order of the where clauses was deterministic, the ordering of bounds and lifetimes was not. This made the order flip- flop randomly when new traits and impls were added to libstd. This PR makes the ordering of bounds and lifetimes deterministic, and re-enables the test that was causing the issue. Fixes rust-lang#49123
Apply temporary fix of travis-ci/dpl#788.
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
|
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ p=300 We are retrying these for too long today, let's merge them altogether. |
|
📌 Commit de9fb3b has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - status-appveyor, status-travis |
kennytm-githubbot
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Mar 21, 2018
Tested on commit rust-lang/rust@1042053. Direct link to PR: <rust-lang/rust#49221> 💔 rls on windows: test-pass → build-fail (cc @nrc). 💔 rls on linux: test-pass → build-fail (cc @nrc).
This was referenced Mar 21, 2018
Merged
|
@nrc Since this is the week before beta branch, can you prioritize a fix for the RLS? |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.