Skip to content

Rollup of 8 pull requests - #78562

Merged
bors merged 20 commits into
rust-lang:masterfrom
JohnTitor:rollup-otg906u
Oct 30, 2020
Merged

Rollup of 8 pull requests#78562
bors merged 20 commits into
rust-lang:masterfrom
JohnTitor:rollup-otg906u

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

pickfireand others added 20 commits September 29, 2020 21:39
Move LEN so it is is read in order.
Signed-off-by: wcampbell <wcampbell1995@gmail.com>
Logically this first eliminates the innermost match by merging the patterns.
Then, in a second step, turns the newly innermost match into a `matches!` call.
$ touch empty.rs
$ env RUSTC_LOG=debug rustc +stage1 --crate-type=lib empty.rs
Fails with a `BorrowMutError` because source map files are already
borrowed while `features_query` attempts to format a log message
containing a span.
Release the borrow before the query to avoid the issue.
And two small intra-doc link conversions in `std::{f32, f64}`.
Reorder benches const variable
Move LEN so it is is read in order.
…, r=jyn514
Simplify a nested bool match
Logically this first eliminates the innermost match by merging the patterns.
Then, in a second step, turns the newly innermost match into a `matches!` call.
…ession, r=dtolnay
Revert invalid `fn` return type parsing change
Revert one of the changes in rust-lang#78379.
Fixrust-lang#78507.
…n1011
Avoid BorrowMutError with RUSTC_LOG=debug
```console
$ touch empty.rs
$ env RUSTC_LOG=debug rustc +stage1 --crate-type=lib empty.rs
```
Fails with a `BorrowMutError` because source map files are already
borrowed while `features_query` attempts to format a log message
containing a span.
Release the borrow before the query to avoid the issue.
Make anonymous binders start at 0
A few changes to some test outputs, but these actually look *more* correct to me.
…wording, r=jyn514
Improve wording of `core::ptr::drop_in_place` docs
And two small intra-doc link conversions in `std::{f32, f64}`.
Link to pass docs from NRVO module docs
It can be easy to miss that this is documented on the pass's struct if you are
looking at the module docs.
Cc https://rust-lang.zulipchat.com/#narrow/stream/189540-t-compiler.2Fwg-mir-opt/topic/what.20is.20NRVO.3F
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5
@rustbot modify labels: rollup

@bors

bors commented Oct 30, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 2471a7c has been approved by JohnTitor

@rustbotrustbot added the rollup A PR which is a rollup label Oct 30, 2020
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 30, 2020
@bors

bors commented Oct 30, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2471a7c with merge 388ef34...

@bors

bors commented Oct 30, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 388ef34 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 30, 2020
@bors
bors merged commit 388ef34 into rust-lang:masterOct 30, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 30, 2020
@JohnTitor
JohnTitor deleted the rollup-otg906u branch October 30, 2020 12:49
@borsbors mentioned this pull request Oct 30, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@JohnTitor@bors@rustbot@pickfire@wcampbell0x2a@LingMan@estebank@tmiasko@jackh726@camelid