Skip to content

Rollup of 6 pull requests - #40167

Merged
bors merged 29 commits into
rust-lang:masterfrom
frewsxcv:rollup
Mar 1, 2017
Merged

Rollup of 6 pull requests#40167
bors merged 29 commits into
rust-lang:masterfrom
frewsxcv:rollup

Conversation

djzinand others added 29 commits February 18, 2017 18:57
Changed stability annotations for the new Error and Display impls
for std::ffi::FromBytesWithNulError as they aren't subject to
stability the same way.
Simplify `TokenTree` and fix `macro_rules!` bugs
This PR
- fixesrust-lang#39390, fixesrust-lang#39403, and fixesrust-lang#39404 (each is a [breaking-change], see issues for examples),
- fixesrust-lang#39889,
- simplifies and optimizes macro invocation parsing,
- cleans up `ext::tt::transcribe`,
- removes `tokenstream::TokenTree::Sequence` and `Token::MatchNt`,
- instead, adds a new type `ext::tt::quoted::TokenTree` for use by `macro_rules!` (`ext::tt`)
- removes `parser.quote_depth` and `parser.parsing_token_tree`, and
- removes `quote_matcher!`.
- Instead, use `quote_tokens!` and `ext::tt::quoted::parse` the result with `expect_matchers=true`.
- I found no outside uses of `quote_matcher!` when searching Rust code on Github.
r? @nrc
…excrichton
impl RangeArgument for RangeInclusive and add appropriate tests
Now that `RangeArgument` returns a `Bound`, the impl for `RangeInclusive` is natural to implement and all that's required are tests around it.
…=frewsxcv
Improve associated constant rendering in rustdoc
Before:
<img width="1440" alt="screen shot 2017-02-19 at 00 30 51" src="https://cloud.githubusercontent.com/assets/3050060/23097697/caeed80e-f63a-11e6-98c2-5d27e4efd76d.png">
After:
<img width="1440" alt="screen shot 2017-02-19 at 00 30 39" src="https://cloud.githubusercontent.com/assets/3050060/23097698/cfb4874e-f63a-11e6-80cf-ffbf5c5c6162.png">
cc @SergioBenitez
r? @rust-lang/docs
added Error and Display impl for std::ffi::FromBytesWithNulError
Fixesrust-lang#39925.
This is my first PR, so I wasn't quite sure about the stability annotation.
…excrichton
impl FromIterator<&char> for String
Move two large error_reporting fn's to a separate file
Hello!
I tried to make `librustc/infer/error_reporting,rs` more readable by modularizing it and moving its two largest functions to a separate file.
If you have any suggestions, please send it right away! 🚀
Thanks goes to @nikomatsakis for supporting.
@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10

@bors

bors commented Mar 1, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 0b5bf67 has been approved by frewsxcv

@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 @pnkfelix (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.

@bors

bors commented Mar 1, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0b5bf67 with merge 88f7016...

bors added a commit that referenced this pull request Mar 1, 2017
Rollup of 6 pull requests
- Successful merges: #39419, #39936, #39944, #39960, #40028, #40128
- Failed merges:
@bors

bors commented Mar 1, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

@bors retry

I don't know weird llvm thing

@bors

bors commented Mar 1, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0b5bf67 with merge b671c32...

bors added a commit that referenced this pull request Mar 1, 2017
Rollup of 6 pull requests
- Successful merges: #39419, #39936, #39944, #39960, #40028, #40128
- Failed merges:
@bors

bors commented Mar 1, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 0b5bf67 into rust-lang:masterMar 1, 2017
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 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@bors@rust-highfive@pnkfelix@Centril@djzin@chordowl@withoutboats@GuillaumeGomez@jseyfried