Skip to content

Conversation

Xanewok
Copy link
Contributor

@Xanewok Xanewok commented Aug 5, 2019

Most importantly this includes:

Which fixes the annoying problem where users couldn't format via RLS while cargo fmt worked.

The beta cut-off is drawing near and I'd like to make sure this lands before then.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 5, 2019
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 7, 2019

📌 Commit 2eb06cb has been approved by nikomatsakis

@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 Aug 7, 2019
@bors
Copy link
Collaborator

bors commented Aug 8, 2019

⌛ Testing commit 2eb06cb with merge 0452340...

bors added a commit that referenced this pull request Aug 8, 2019
Update RLS

Most importantly this includes:
* Collect file -> edition mapping after AST expansion ([#1513](rust-lang/rls#1513)) (enabled by #62679)
* Fix rustfmt during builds by reading edition from manifest ([#1533](rust-lang/rls#1533))

Which fixes the annoying problem where users couldn't format via RLS while `cargo fmt` worked.

The beta cut-off is drawing near and I'd like to make sure this lands before then.
@bors
Copy link
Collaborator

bors commented Aug 8, 2019

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing 0452340 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 8, 2019
@bors bors merged commit 2eb06cb into rust-lang:master Aug 8, 2019
@Xanewok Xanewok deleted the update-rls branch August 8, 2019 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

4 participants