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

syntax: Remove Deref impl from Token #61669

Merged
merged 4 commits into from
Jun 9, 2019
Merged

Conversation

petrochenkov
Copy link
Contributor

Follow up to #61541

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 8, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Jun 8, 2019

Thanks for the absolutely clean diff.

@bors r+

@bors
Copy link
Contributor

bors commented Jun 8, 2019

📌 Commit 9aaa7c7 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 8, 2019
@Centril
Copy link
Contributor

Centril commented Jun 8, 2019

Oh no =P Now I'll have to rebase #60932 again 😂

Centril added a commit to Centril/rust that referenced this pull request Jun 8, 2019
 syntax: Remove `Deref` impl from `Token`

Follow up to rust-lang#61541

r? @oli-obk
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 merged commit 9aaa7c7 into rust-lang:master Jun 9, 2019
@petrochenkov petrochenkov deleted the tokderef2 branch June 9, 2019 07:35
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Jun 9, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jun 9, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jun 9, 2019
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 9, 2019
Changes:
````
travis: disable rls integration test.
rustup rust-lang#61669
Add OUTER_EXPN_INFO lint
````
Centril added a commit to Centril/rust that referenced this pull request Jun 10, 2019
…hearth

submodules: update clippy from 71be6f6 to c0dbd34

Changes:
````
travis: disable rls integration test.
rustup rust-lang#61669
Add OUTER_EXPN_INFO lint
````

Should fix clippy toolstate
Centril added a commit to Centril/rust that referenced this pull request Jun 10, 2019
…hearth

submodules: update clippy from 71be6f6 to c0dbd34

Changes:
````
travis: disable rls integration test.
rustup rust-lang#61669
Add OUTER_EXPN_INFO lint
````

Should fix clippy toolstate
Centril added a commit to Centril/rust that referenced this pull request Jun 10, 2019
…hearth

submodules: update clippy from 71be6f6 to c0dbd34

Changes:
````
travis: disable rls integration test.
rustup rust-lang#61669
Add OUTER_EXPN_INFO lint
````

Should fix clippy toolstate
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
Changes:
````
travis: disable rls integration test.
rustup rust-lang/rust#61669
Add OUTER_EXPN_INFO lint
````
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants