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 4 pull requests #65433

Merged
merged 13 commits into from
Oct 15, 2019
Merged

Rollup of 4 pull requests #65433

merged 13 commits into from
Oct 15, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 15, 2019

Successful merges:

Failed merges:

r? @ghost

nnethercote and others added 13 commits October 15, 2019 14:23
This is on-trend with the recent changes simplifying
`LocalInternedString` and reducing its use.
rust-lang#64272 replaced
`DiagnosticBuilder` with `Diagnostic` in some places. This commit just
renames the DB variable from `db` to `diag` where it wasn't renamed.
Stabilize proc macros generating `macro_rules` items

Fn-like and attribute proc macros can now generate `macro_rules` items.

cc rust-lang#54727
…String-PartialEq-impls, r=petrochenkov

Remove custom `PartialEq` impls for `LocalInternedString`.

This is on-trend with the recent changes simplifying
`LocalInternedString` and reducing its use.

r? @petrochenkov
Refactor: Rename `db` locals to `diag`

rust-lang#64272 replaced `DiagnosticBuilder` with `Diagnostic` in some places. This PR just renames the db variable from `db` to `diag` where it wasn't renamed.

r? @Mark-Simulacrum
@Centril
Copy link
Contributor Author

Centril commented Oct 15, 2019

Fixed the conflict between #64035 and #65376 manually in 8370f14.

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Oct 15, 2019

📌 Commit 8370f14 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 Oct 15, 2019
@bors
Copy link
Contributor

bors commented Oct 15, 2019

⌛ Testing commit 8370f14 with merge 237d54f...

bors added a commit that referenced this pull request Oct 15, 2019
Rollup of 4 pull requests

Successful merges:

 - #64035 (Stabilize proc macros generating `macro_rules` items)
 - #65376 (syntax: misc extractions)
 - #65426 (Remove custom `PartialEq` impls for `LocalInternedString`.)
 - #65428 (Refactor: Rename `db` locals to `diag`)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 15, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 15, 2019
@bors bors merged commit 8370f14 into rust-lang:master Oct 15, 2019
@bors bors mentioned this pull request Oct 15, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #65433!

Tested on commit 237d54f.
Direct link to PR: #65433

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 15, 2019
Tested on commit rust-lang/rust@237d54f.
Direct link to PR: <rust-lang/rust#65433>

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
@Centril Centril deleted the rollup-rzvry15 branch October 15, 2019 19:21
@Centril Centril added the rollup A PR which is a rollup label Oct 18, 2019
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.

None yet

6 participants