Skip to content

Rollup of 8 pull requests - #90000

Merged
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-vj7wwur
Oct 18, 2021
Merged

Rollup of 8 pull requests#90000
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-vj7wwur

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

infinity0and others added 16 commits October 16, 2021 13:30
Currently the verbosity settings are:
- 2: RUSTC-SHIM envvars get spammed on every invocation, O(30) lines
cargo is passed -v which outputs CLI invocations, O(5) lines
- 3: cargo is passed -vv which outputs build script output, O(0-10) lines
This commit changes it to:
- 1: cargo is passed -v, O(5) lines
- 2: cargo is passed -vv, O(10) lines
- 3: RUSTC-SHIM envvars get spammed, O(30) lines
The equivalent for `Symbol`s was renamed some time ago (`kw::Invalid` -> `kw::Empty`), and it makes sense to do the same thing for `Ident`s.
rust-lang/backtrace-rs#446 allows binaries built
with Nix on macOS to be symbolized.
bootstrap: tweak verbosity settings
Currently the verbosity settings are:
- 2: RUSTC-SHIM envvars get spammed on every invocation, O(30) lines
cargo is passed -v which outputs CLI invocations, O(5) lines
- 3: cargo is passed -vv which outputs build script output, O(0-10) lines
This commit changes it to:
- 1: cargo is passed -v, O(5) lines
- 2: cargo is passed -vv, O(10) lines
- 3: RUSTC-SHIM envvars get spammed, O(30) lines
…-mut, r=petrochenkov
Fix ICE with `let...else` and `ref mut`
Fixesrust-lang#89960, opened for review.
I'm not satisfied with the current diagnostics, any ideas?
Nicer error message if the user attempts to do let...else if
Gives a nice "conditional `else if` is not supported for `let...else`" error when encountering a `let...else if` pattern, as suggested in the [let...else tracking issue](rust-lang#87335 (comment)).
…c, r=GuillaumeGomez
Check implementing type for `#[doc(hidden)]`
Closesrust-lang#85526.
rustdoc: Add static size assertion for `clean::Type`
r? `@jyn514`
rustc_span: `Ident::invalid` -> `Ident::empty`
The equivalent for `Symbol`s was renamed some time ago (`kw::Invalid` -> `kw::Empty`), and it makes sense to do the same thing for `Ident`s as well.
Remove dead code from `compiletest::json`
Currently getting a dead code warning on master. Might make sense to remove.
…ulacrum
Bump backtrace
rust-lang/backtrace-rs#446 allows binaries built with Nix on macOS to be symbolized.
@rustbotrustbot added the rollup A PR which is a rollup label Oct 18, 2021
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=8 rollup=never

@bors

bors commented Oct 18, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 2724b00 has been approved by matthiaskrgr

@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 18, 2021
@bors

bors commented Oct 18, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2724b00 with merge 5dab47d...

@bors

bors commented Oct 18, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5dab47d to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 18, 2021
@bors
bors merged commit 5dab47d into rust-lang:masterOct 18, 2021
@rustbotrustbot added this to the 1.58.0 milestone Oct 18, 2021
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (5dab47d): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@matthiaskrgr
matthiaskrgr deleted the rollup-vj7wwur branch November 20, 2021 15:04
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.

11 participants

@matthiaskrgr@bors@rust-timer@rustbot@infinity0@JohnTitor@petrochenkov@est31@camelid@pierwill@winterqt