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

parser: Remove Deref impl from Parser #61616

Merged
merged 3 commits into from
Jun 8, 2019
Merged

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Jun 7, 2019

Follow up to #61541

You have to write self.token.span instead of self.span in the parser now, which is not nice, but not too bad either, I guess.
Not sure.
Probably still better than people using both and being confused about the definition point of span.

r? @oli-obk @estebank

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

oli-obk commented Jun 7, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jun 7, 2019

📌 Commit 3dbee57 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 7, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 7, 2019
parser: Remove `Deref` impl from `Parser`

Follow up to rust-lang#61541

You have to write `self.token.span` instead of `self.span` in the parser now, which is not nice, but not too bad either, I guess.
Not sure.
Probably still better than people using both and being confused about the definition point of `span`.

r? @oli-obk @estebank
Centril added a commit to Centril/rust that referenced this pull request Jun 7, 2019
parser: Remove `Deref` impl from `Parser`

Follow up to rust-lang#61541

You have to write `self.token.span` instead of `self.span` in the parser now, which is not nice, but not too bad either, I guess.
Not sure.
Probably still better than people using both and being confused about the definition point of `span`.

r? @oli-obk @estebank
Centril added a commit to Centril/rust that referenced this pull request Jun 7, 2019
parser: Remove `Deref` impl from `Parser`

Follow up to rust-lang#61541

You have to write `self.token.span` instead of `self.span` in the parser now, which is not nice, but not too bad either, I guess.
Not sure.
Probably still better than people using both and being confused about the definition point of `span`.

r? @oli-obk @estebank
@bors
Copy link
Contributor

bors commented Jun 8, 2019

⌛ Testing commit 3dbee57 with merge 097284ba69c267b38e99f77e6f8111142fda7a02...

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

Follow up to rust-lang#61541

You have to write `self.token.span` instead of `self.span` in the parser now, which is not nice, but not too bad either, I guess.
Not sure.
Probably still better than people using both and being confused about the definition point of `span`.

r? @oli-obk @estebank
@Centril
Copy link
Contributor

Centril commented Jun 8, 2019

@bors retry r0lled up

bors added a commit that referenced this pull request Jun 8, 2019
Rollup of 7 pull requests

Successful merges:

 - #61223 (Document tuple's Ord behavior as sequential)
 - #61615 (syntax: Treat error literals in more principled way)
 - #61616 (parser: Remove `Deref` impl from `Parser`)
 - #61621 (Clarify when we run steps with ONLY_HOSTS)
 - #61627 (Add regression test for #61452.)
 - #61641 (Revert "Make LocalAnalizer visitor iterate instead of recurse")
 - #61647 (Use stable wrappers in f32/f64::signum)

Failed merges:

r? @ghost
@rust-highfive
Copy link
Collaborator

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
Checking out files: 100% (18443/18443), done.
travis_time:end:031b67e0:start=1559957749891587000,finish=1559957760369283000,duration=10477696000
$ cd rust-lang/rust
$ git checkout -qf 097284ba69c267b38e99f77e6f8111142fda7a02
fatal: reference is not a tree: 097284ba69c267b38e99f77e6f8111142fda7a02
The command "git checkout -qf 097284ba69c267b38e99f77e6f8111142fda7a02" failed and exited with 128 during .
Your build has been stopped.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Jun 8, 2019

⌛ Testing commit 3dbee57 with merge 6312b89...

@bors bors merged commit 3dbee57 into rust-lang:master Jun 8, 2019
@petrochenkov petrochenkov deleted the parsderef branch June 8, 2019 15:47
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.

6 participants