Skip to content

Rollup of 6 pull requests - #61672

Merged
bors merged 22 commits into
rust-lang:masterfrom
Centril:rollup-jxo89ir
Jun 9, 2019
Merged

Rollup of 6 pull requests#61672
bors merged 22 commits into
rust-lang:masterfrom
Centril:rollup-jxo89ir

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

L117and others added 22 commits June 8, 2019 09:39
Unlike other built-in attributes, this attribute accepts any input
Remove useless allocations in macro_rules follow logic.
Closesrust-lang#61543
remove useless ident() functions in const tests
and replace the useful ones by black_box (with a comment)
r? @oli-obk
Minimize use of `#![feature(custom_attribute)]`
Some preparations before resurrecting rust-lang#57921.
 syntax: Remove `Deref` impl from `Token`
Follow up to rust-lang#61541
r? @oli-obk
Update RLS
This bumps the version to 1.37 and also doesn't build clippy by default (should reduce toolstate breakages, see rust-lang#59761 (comment) for more details)
r? @oli-obk
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=6 rollup=never

@bors

bors commented Jun 8, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit e0c825c has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 8, 2019
@bors

bors commented Jun 8, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e0c825c with merge 053666f...

bors added a commit that referenced this pull request Jun 8, 2019
Rollup of 6 pull requests
Successful merges:
- #61646 (Remove useless allocations in macro_rules follow logic.)
- #61658 (remove useless ident() functions in const tests)
- #61660 (Minimize use of `#![feature(custom_attribute)]`)
- #61666 (Add test for trait ICE)
- #61669 ( syntax: Remove `Deref` impl from `Token`)
- #61670 (Update RLS)
Failed merges:
r? @ghost
@bors

bors commented Jun 9, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 053666f to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 9, 2019
@bors
bors merged commit e0c825c into rust-lang:masterJun 9, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #61672!

Tested on commit 053666f.
Direct link to PR: #61672

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 9, 2019
Tested on commit rust-lang/rust@053666f.
Direct link to PR: <rust-lang/rust#61672>
💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
@Centril
Centril deleted the rollup-jxo89ir branch June 9, 2019 02:09
@Manishearth

Copy link
Copy Markdown
Member

Toolstate is probably #61669

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.

8 participants

@Centril@bors@rust-highfive@Manishearth@RalfJung@petrochenkov@JohnTitor@Xanewok