Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 11 pull requests #77589

Closed
wants to merge 26 commits into from
Closed

Rollup of 11 pull requests #77589

wants to merge 26 commits into from

Conversation

jonas-schievink
Copy link
Contributor

Successful merges:

Failed merges:

r? @ghost

poliorcetics and others added 26 commits September 5, 2020 22:37
Replaces simple bool `match`es of the form

    match $expr {
        $pattern => true
        _ => false
    }

and their inverse with invocations of the matches! macro.
…ant in the language.

(Note that the fact this test existed is a slight sign that we may need a crater
run on this bugfix...)
That is, this changes `#[forbid(foo)] #[allow(foo)]` from allowing foo to
forbidding foo.
…odrAus

Add a note about the panic behavior of math operations on time objects

Fixes #71226.
Reduce boilerplate with the matches! macro

Replaces simple bool `match`es of the form

    match $expr {
        $pattern => true
        _ => false
    }

and their inverse with invocations of the matches! macro.

Limited to rustc_middle for now to get my feet wet.
Avoid unchecked casts in net parser

Once this and #77426 are in, I'll send another PR adding scope id parsing.

r? @dtolnay
…e-forbid-in-same-scope, r=petrochenkov

Disallow overriding forbid in same scope

Rebased #73379.

Fixes #70819.
Rename bootstrap/defaults/{config.toml.PROFILE => config.PROFILE.toml}

This allows these files to have okay syntax highlighting in editors, and helps avoid nagging from editors which want to suggest that I install a plugin for `*.library` files to view the `config.toml.library` or whatever.

It's a very minor change.

r?@jyn514
Fix LitKind's byte buffer to use refcounted slice

While working on adding a new lint for clippy (see rust-lang/rust-clippy#6044) for avoiding shared ownership of "mutable buffer" types (such as using `Rc<Vec<T>>` instead of `Rc<[T]>`), I noticed a type exported from rustc_ast and used by clippy gets caught by the lint. This PR fixes the exported type.

This PR includes the actual change to clippy too, but I will open a PR directly against clippy for that part (although it will currently fail to build there).
inliner: use caller param_env

We used the callee param env instead of the caller param env by accident in #77430, this PR fixes that and caches it in the `Inliner` struct.

fixes #77564

r? @ecstatic-morse
Use matches! for core::char methods
Fix span for unicode escape suggestion.

If a unicode escape is missing the curly braces, the suggested fix is to add the curly braces, but the span for the fix was incorrect. It was not covering the `\u`, but the suggested text includes the `\u`, causing the resulting fix to be `"\u\u{1234}"`. This changes it so that the span includes the `\u`. An alternate fix would be to remove `\u` from the suggested fix, but I think the error message reads better if the entire escape is included.
@jonas-schievink
Copy link
Contributor Author

@bors r+ rollup=never p=11

@rustbot modify labels: rollup

@bors
Copy link
Contributor

bors commented Oct 5, 2020

📌 Commit 7af4959 has been approved by jonas-schievink

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

bors commented Oct 5, 2020

⌛ Testing commit 7af4959 with merge 7249e4285462f522a6a0667112e87a422cebb9f2...

@bors
Copy link
Contributor

bors commented Oct 6, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 6, 2020
@jonas-schievink
Copy link
Contributor Author

Hmm, the only thing I can see is that the coverage tests are failing on AArch64 only, with diffs like

-  | <generics::Firework<i32> as core::ops::drop::Drop>::drop:
+  | <generics::Firework<i32> as core[a7a74cee373f048]::ops::drop::Drop>::drop:

That seems weird, they're already failing in #77080, so they shouldn't cause the whole pipeline to fail (the builder is called "fallible")

@jonas-schievink jonas-schievink deleted the rollup-xc3y2ia branch October 6, 2020 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.