Skip to content

Conversation

@JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

pickfire and others added 20 commits September 29, 2020 21:39
Move LEN so it is is read in order.
Signed-off-by: wcampbell <[email protected]>
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.

Fix rust-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}`.
@JohnTitor
Copy link
Member Author

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

@bors
Copy link
Collaborator

bors commented Oct 30, 2020

📌 Commit 2471a7c has been approved by JohnTitor

@rustbot rustbot added the rollup A PR which is a rollup label Oct 30, 2020
@bors bors 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
Copy link
Collaborator

bors commented Oct 30, 2020

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

@bors
Copy link
Collaborator

bors commented Oct 30, 2020

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

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

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: 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