Skip to content

Rollup of 7 pull requests - #42739

Closed
frewsxcv wants to merge 14 commits into
rust-lang:masterfrom
frewsxcv:rollup
Closed

Rollup of 7 pull requests#42739
frewsxcv wants to merge 14 commits into
rust-lang:masterfrom
frewsxcv:rollup

Conversation

Mark-Simulacrumand others added 14 commits June 16, 2017 07:44
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.
…crichton
Use custom cargo/rustc paths when parsing flags.
Fixesrust-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
…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.
Fixesrust-lang#42679, which describes ICE caused by the bug.
@rust-highfive

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@frewsxcv@rust-highfive@alexcrichton@Centril@Mark-Simulacrum@alexbool@ubsan@murarth@tirr-c@MaloJaffre