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

Rustup to rust-lang/rust#67707 #4973

Merged
merged 3 commits into from
Dec 31, 2019
Merged

Rustup to rust-lang/rust#67707 #4973

merged 3 commits into from
Dec 31, 2019

Conversation

JohnTitor
Copy link
Member

syntax_pos -> rustc_span

changelog: none

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Dec 31, 2019
@phansch
Copy link
Member

phansch commented Dec 31, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 31, 2019

📌 Commit 9086b17 has been approved by phansch

@bors
Copy link
Collaborator

bors commented Dec 31, 2019

⌛ Testing commit 9086b17 with merge 9c0ac45...

bors added a commit that referenced this pull request Dec 31, 2019
Rustup to rust-lang/rust#67707

`syntax_pos` -> `rustc_span`

changelog: none
@bors
Copy link
Collaborator

bors commented Dec 31, 2019

💔 Test failed - checks-travis

@JohnTitor
Copy link
Member Author

It seems a tiny change from the latest rustc, fixed.

@phansch
Copy link
Member

phansch commented Dec 31, 2019

thanks again!

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 31, 2019

📌 Commit bf08998 has been approved by phansch

@bors
Copy link
Collaborator

bors commented Dec 31, 2019

⌛ Testing commit bf08998 with merge 1ab5d71...

bors added a commit that referenced this pull request Dec 31, 2019
Rustup to rust-lang/rust#67707

`syntax_pos` -> `rustc_span`

changelog: none
@bors
Copy link
Collaborator

bors commented Dec 31, 2019

💔 Test failed - checks-travis

@JohnTitor
Copy link
Member Author

Hm, it's spurious?

@phansch
Copy link
Member

phansch commented Dec 31, 2019

Not really sure: thread 'integration_test' panicked at 'error: E0463', tests/integration.rs:61:9. Let's retry.

@bors retry

@bors
Copy link
Collaborator

bors commented Dec 31, 2019

⌛ Testing commit bf08998 with merge a40b022...

bors added a commit that referenced this pull request Dec 31, 2019
Rustup to rust-lang/rust#67707

`syntax_pos` -> `rustc_span`

changelog: none
@bors
Copy link
Collaborator

bors commented Dec 31, 2019

💔 Test failed - checks-travis

@phansch
Copy link
Member

phansch commented Dec 31, 2019

Ah, RLS will probably also need a similar Rustup. It's fine to ignore that integration test for now.

@JohnTitor
Copy link
Member Author

Got it, let's ignore then.

@phansch
Copy link
Member

phansch commented Dec 31, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 31, 2019

📌 Commit 18b1542 has been approved by phansch

@bors
Copy link
Collaborator

bors commented Dec 31, 2019

⌛ Testing commit 18b1542 with merge d9e38f5...

bors added a commit that referenced this pull request Dec 31, 2019
Rustup to rust-lang/rust#67707

`syntax_pos` -> `rustc_span`

changelog: none
@bors
Copy link
Collaborator

bors commented Dec 31, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: phansch
Pushing d9e38f5 to master...

@bors bors merged commit 18b1542 into rust-lang:master Dec 31, 2019
@JohnTitor JohnTitor deleted the rustup-1231 branch December 31, 2019 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants