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

Collect file -> edition mapping after AST expansion #1513

Merged
merged 2 commits into from Aug 4, 2019

Conversation

@Xanewok
Copy link
Member

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

This comment has been minimized.

Copy link
Contributor

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 Xanewok:collect-files-after-expansion branch from ef31716 to 34d8df7 Jul 21, 2019

@Xanewok Xanewok force-pushed the Xanewok:collect-files-after-expansion branch 2 times, most recently from e353b47 to 4586c35 Jul 31, 2019

Xanewok added some commits Jul 14, 2019

Collect crate files after expansion but before analysis
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 Xanewok:collect-files-after-expansion branch from 4586c35 to 04ae465 Aug 4, 2019

@Xanewok Xanewok merged commit d2cc327 into rust-lang:master Aug 4, 2019

6 checks passed

Travis CI - Pull Request Build Passed
Details
rust-lang.rls Build #20190804.11 succeeded
Details
rust-lang.rls (Check formatting) Check formatting succeeded
Details
rust-lang.rls (Run tests on linux) Run tests on linux succeeded
Details
rust-lang.rls (Run tests on mac) Run tests on mac succeeded
Details
rust-lang.rls (Run tests on windows) Run tests on windows succeeded
Details

@Xanewok Xanewok deleted the Xanewok:collect-files-after-expansion branch Aug 4, 2019

Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 4, 2019

Collect files -> editions mapping after expansion when out-of-process
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
@Xanewok Xanewok referenced this pull request Aug 5, 2019

Xanewok added a commit to Xanewok/rls that referenced this pull request Aug 6, 2019

Collect files -> editions mapping after expansion when out-of-process
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

Auto merge of #63282 - Xanewok:update-rls, r=nikomatsakis
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

Collect files -> editions mapping after expansion when out-of-process
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

Collect files -> editions mapping after expansion when out-of-process
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

Collect files -> editions mapping after expansion when out-of-process
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

Collect files -> editions mapping after expansion when out-of-process
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

Collect files -> editions mapping after expansion when out-of-process
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

Collect files -> editions mapping after expansion when out-of-process
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

Collect files -> editions mapping after expansion when out-of-process
Applies the equivalent of rust-lang#1513 in the out-of-process compilation case
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.