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

Conversation

Projects
None yet
5 participants
@petrochenkov
Copy link
Contributor

commented Jun 8, 2019

Follow up to #61541

r? @oli-obk

@oli-obk

This comment has been minimized.

Copy link
Contributor

commented Jun 8, 2019

Thanks for the absolutely clean diff.

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 8, 2019

📌 Commit 9aaa7c7 has been approved by oli-obk

@Centril

This comment has been minimized.

Copy link
Member

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

Rollup merge of rust-lang#61669 - petrochenkov:tokderef2, r=oli-obk
 syntax: Remove `Deref` impl from `Token`

Follow up to rust-lang#61541

r? @oli-obk

@Centril Centril referenced this pull request Jun 8, 2019

Merged

Rollup of 6 pull requests #61672

bors added a commit that referenced this pull request Jun 8, 2019

Auto merge of #61672 - Centril:rollup-jxo89ir, r=Centril
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

1 check passed

Travis CI - Pull Request Build Passed
Details

@petrochenkov petrochenkov deleted the petrochenkov:tokderef2 branch Jun 9, 2019

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

submodules: update clippy from 71be6f62 to c0dbd34b
Changes:
````
travis: disable rls integration test.
rustup rust-lang#61669
Add OUTER_EXPN_INFO lint
````

bors added a commit that referenced this pull request Jun 9, 2019

Auto merge of #61697 - matthiaskrgr:submodule_upd, r=Manishearth
submodules: update clippy from 71be6f62 to c0dbd34b

Changes:
````
travis: disable rls integration test.
rustup #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

Rollup merge of rust-lang#61697 - matthiaskrgr:submodule_upd, r=Manis…
…hearth

submodules: update clippy from 71be6f62 to c0dbd34b

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

Rollup merge of rust-lang#61697 - matthiaskrgr:submodule_upd, r=Manis…
…hearth

submodules: update clippy from 71be6f62 to c0dbd34b

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

Should fix clippy toolstate

bors added a commit that referenced this pull request Jun 10, 2019

Auto merge of #61697 - matthiaskrgr:submodule_upd, r=Manishearth
submodules: update clippy from 71be6f62 to c0dbd34b

Changes:
````
travis: disable rls integration test.
rustup #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

Rollup merge of rust-lang#61697 - matthiaskrgr:submodule_upd, r=Manis…
…hearth

submodules: update clippy from 71be6f62 to c0dbd34b

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

Should fix clippy toolstate
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.