Skip to content

Rollup of 10 pull requests #69950

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 40 commits into from
Mar 12, 2020
Merged

Rollup of 10 pull requests #69950

merged 40 commits into from
Mar 12, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 12, 2020

Successful merges:

Failed merges:

r? @ghost

mark-i-m and others added 30 commits March 3, 2020 12:29
This should allow LexError to play much nicer with the `?` operator.
Centril added 10 commits March 12, 2020 16:32
…=Centril

Add Display and Error impls for proc_macro::LexError

This should allow LexError to play much nicer with the `?` operator.

Fixes rust-lang#68896.

(I'm not sure if I did the stability attributes right, so if I need to change them, please let me know!)
…rk-Simulacrum

Document unsafe blocks in core::fmt

r? @RalfJung
CC: @rust-lang/wg-unsafe-code-guidelines
rust-lang#66219

Sorry for the hiatus, but here's a few more files with the unsafe blocks documented! I think working on it smaller chunks like this will be easier for everyone.
…ta, r=Mark-Simulacrum

Toolstate: remove redundant beta-week check.

I made a bit of a mistake in rust-lang#69624.  The "beta regression" doesn't need to be checked twice.

I also rolled up rust-lang#69693 to avoid merge conflicts.
…Centril

Tweak output for invalid negative impl AST errors

Use more accurate spans for negative `impl` errors.

r? @Centril
…etroalbini

Rename rustc guide

This is in preparation for rust-lang/rustc-dev-guide#470
Needs to be merged after we actually rename the guide.

Have used this to rename:

`git grep -l 'rustc_guide' | xargs sed -i 's/rustc_guide/rustc_dev_guide/g'`
`git grep -l 'rustc-guide' | xargs sed -i 's/rustc-guide/rustc-dev-guide/g'`
`git grep -l 'rustc guide' | xargs sed -i 's/rustc guide/rustc dev guide/g'`
…r, r=sfackler

Implement Error for TryReserveError

I noticed that the Error trait wasn't implemented for TryReserveError. (rust-lang#48043)

Not sure if the error messages and code style are 100% correct, it's my first time contributing to the Rust std.
…=oli-obk

miri: ICE on invalid terminators

We've run a lot of MIR in Miri (including some generators) and never seen these.

@tmandry is it correct that `Yield` and `GeneratorDrop` get lowered away?

@eddyb @oli-obk what's with this `Abort` that does not seem to ever actually exist? Codegen *does* seem to handle it, so I wonder why Miri can get away without that. In fact, codegen handles it twice:

https://github.com/rust-lang/rust/blob/1d5241c96208ca7d925442b1a5fa45ad18717a6f/src/librustc_codegen_ssa/mir/block.rs#L796

https://github.com/rust-lang/rust/blob/1d5241c96208ca7d925442b1a5fa45ad18717a6f/src/librustc_codegen_ssa/mir/mod.rs#L296
rustdoc: remove unused import

```
    Checking rustdoc v0.0.0 (/home/matthias/vcs/github/rust/src/librustdoc)
warning: unused import: `rustc_span::symbol::sym`
  --> src/librustdoc/clean/inline.rs:15:5
   |
15 | use rustc_span::symbol::sym;
   |     ^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `#[warn(unused_imports)]` on by default
```
@Centril Centril added the rollup A PR which is a rollup label Mar 12, 2020
@Centril
Copy link
Contributor Author

Centril commented Mar 12, 2020

@bors r+ p=10 rollup=never

@bors
Copy link
Collaborator

bors commented Mar 12, 2020

📌 Commit 9463cf3 has been approved by Centril

@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 Mar 12, 2020
@bors
Copy link
Collaborator

bors commented Mar 12, 2020

⌛ Testing commit 9463cf3 with merge 54b7d21...

@bors
Copy link
Collaborator

bors commented Mar 12, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 54b7d21 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 12, 2020
@bors bors merged commit 54b7d21 into rust-lang:master Mar 12, 2020
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #69950!

Tested on commit 54b7d21.
Direct link to PR: #69950

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 12, 2020
Tested on commit rust-lang/rust@54b7d21.
Direct link to PR: <rust-lang/rust#69950>

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
@Centril Centril deleted the rollup-xh0hmvx branch March 12, 2020 19:53
# for free to join this conversation on GitHub. Already have an account? # 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.