Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Collect file -> edition mapping after AST expansion #1513

Merged
merged 2 commits into from
Aug 4, 2019

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Jul 14, 2019

Reason for that being so that non-syntax errors should still allow us to reason about which file belongs to a given crate, which specifically allows us to run a formatter even if the code contains type errors or similar.

Should make the formatter Just Work^TM in the cases where it could've technically worked before (e.g. no syntax errors).

Requires rust-lang/rust#62679

@bors
Copy link
Contributor

bors commented Jul 21, 2019

☔ The latest upstream changes (presumably #1519) made this pull request unmergeable. Please resolve the merge conflicts.

@Xanewok Xanewok force-pushed the collect-files-after-expansion branch from ef31716 to 34d8df7 Compare July 21, 2019 22:14
@Xanewok Xanewok force-pushed the collect-files-after-expansion branch 2 times, most recently from e353b47 to 4586c35 Compare August 4, 2019 18:52
Xanewok added 2 commits August 4, 2019 22:27
Reason for that being so that non-syntax errors should still allow us
to reason about which file belongs to a given crate, which specifically
allows us to run a formatter even if the code contains type errors or
similar.
@Xanewok Xanewok force-pushed the collect-files-after-expansion branch from 4586c35 to 04ae465 Compare August 4, 2019 20:28
@Xanewok Xanewok merged commit d2cc327 into rust-lang:master Aug 4, 2019
@Xanewok Xanewok deleted the collect-files-after-expansion branch August 4, 2019 21:03
Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 4, 2019
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 6, 2019
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
bors added a commit to rust-lang/rust 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.
Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 13, 2019
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 13, 2019
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 13, 2019
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 13, 2019
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 13, 2019
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 13, 2019
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 13, 2019
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants