Skip to content

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 10, 2020

Successful merges:

Failed merges:

r? @ghost

ssomers and others added 18 commits April 6, 2020 15:45
…ethod, r=matthewjasper

Consider methods on fundamental `impl` when method is not found on numeric type

Fix rust-lang#47759.
…, r=Amanieu

Remove the Ord bound that was plaguing drain_filter

Now that  rust-lang#70795 made it superfluous. Also removes superfluous lifetime specifiers (at least I think they are).
…tthewjasper

Replace "rc"/"arc" lang items with Rc/Arc diagnostic items.

`Rc`/`Arc` should have no special semantics, so it seems appropriate for them to not be lang items.

r? @matthewjasper
De-abuse TyKind::Error in pattern type checking

r? @eddyb

cc rust-lang#70866

In particular, I would appreciate extra scrutiny over the soundness of these changes.

Also, this will go a bit slowly because I'm going to use my other PR (rust-lang#70551) to check if I missed anything.
…ochenkov

rustc_session CLI lint parsing: mark a temporary hack as such

This code was added in rust-lang#70918, but it should not be necessary any more once `forbid` works as expected for in-code attributes.

Cc @tobithiel @davidtwco
Fix JSON file_name documentation for macros.

JSON `file_name` paths were changed in rust-lang#66364 for macros to point to actual source files instead of using `<MACRONAME macros>`.

Closes rust-lang#70396
@Centril
Copy link
Contributor Author

Centril commented Apr 10, 2020

@bors r+ p=8 rollup=never

@bors
Copy link
Collaborator

bors commented Apr 10, 2020

📌 Commit 68e0e6b 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 Apr 10, 2020
@Centril Centril added the rollup A PR which is a rollup label Apr 10, 2020
@bors
Copy link
Collaborator

bors commented Apr 10, 2020

⌛ Testing commit 68e0e6b with merge dbc3cfd...

@bors
Copy link
Collaborator

bors commented Apr 10, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 10, 2020
@bors bors merged commit dbc3cfd into rust-lang:master Apr 10, 2020
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #70983!

Tested on commit dbc3cfd.
Direct link to PR: #70983

💔 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 Apr 10, 2020
Tested on commit rust-lang/rust@dbc3cfd.
Direct link to PR: <rust-lang/rust#70983>

💔 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-npabk7c branch April 10, 2020 16:40
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.