Rollup of 7 pull requests #42738
Merged
Rollup of 7 pull requests #42738
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
also, make sure the keyword table is correctly spaced
The subpattern type of boxes being nil does not make sense because of box patterns. They should have their inner type as the subpattern type.
Fixes rust-lang#11740. Fixes rust-lang#19601. Fixes rust-lang#22603 Fixes rust-lang#22789. Fixes rust-lang#26614. r? @Mark-Simulacrum.
…crichton Use custom cargo/rustc paths when parsing flags. Fixes rust-lang#41779, probably also rust-lang#42543 (I think they're duplicates). I'm not entirely happy with the implementation, since it means we parse the configuration twice, but it's the minimal solution. I think the other choice is to move both calls to Config::parse inside Flags::parse and merge them, but I don't know if that's a good idea. r? @alexcrichton
Inline StrSearcher::haystack()
…lexcrichton Reintroduce deprecated `collections` crate
Add `_` to the list of keywords also, make sure the keyword table is correctly spaced note: the reference also needs to be updated. This is not the only way to do this in the grammar, but it's my preferred way.
Use T as the subpattern type of Box<T> The subpattern type of boxes being nil does not make sense because of box patterns. They should have their inner type as the subpattern type. Fixes rust-lang#42679, which describes ICE caused by the bug.
…lacrum Add test for rust-lang#24889 Fixes rust-lang#24889. r? @Mark-Simulacrum (Thanks for the instructions).
Add tests for various issues Fixes rust-lang#11740. Fixes rust-lang#19601. Fixes rust-lang#22603 Fixes rust-lang#22789. Fixes rust-lang#26614. r? @Mark-Simulacrum.
|
@bors r+ p=10 |
|
📌 Commit 3bed3bd has been approved by |
|
r? @sfackler (rust_highfive has picked a reviewer for you, use r? to override) |
bors
added a commit
that referenced
this pull request
Jun 18, 2017
|
☀️ Test successful - status-appveyor, status-travis |
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.
collectionscrate #42720, Add_to the list of keywords #42723, Use T as the subpattern type of Box<T> #42730, Add test for #24889 #42731, Add tests for various issues #42734