Subtree update of `rust-analyzer` #129733

lnicola · 2024-08-29T08:44:31Z

…on cfgs

Add an explanatory sentence and some sample code to help readers understand why this struct exists.

minor: Add a doc comment for OpQueue Add an explanatory sentence and some sample code to help readers understand why this struct exists.

…ebold internal: Be more resilient to bad language item definitions in binop inference Fixes rust-lang#16287 Fixes rust-lang#16286 There's one more in `write_fn_trait_method_resolution`, but I'm not sure if it won't cause further problems in `infer_closures`.

fix: Panic while canonicalizing erroneous projection type Fixes rust-lang#17866 The root cause of rust-lang#17866 is quite horrifyng 😨 ```rust trait T { type A; } type Foo = <S as T>::A; // note that S isn't defined fn main() { Foo {} } ``` While inferencing alias type `Foo = <S as T>::A`; https://github.com/rust-lang/rust-analyzer/blob/78c2bdce860dbd996a8083224d01a96660dd6a15/crates/hir-ty/src/infer.rs#L1388-L1398 the error type `S` in it is substituted by inference var in L1396 above as below; https://github.com/rust-lang/rust-analyzer/blob/78c2bdce860dbd996a8083224d01a96660dd6a15/crates/hir-ty/src/infer/unify.rs#L866-L869 This new inference var's index is `1`, as the type inferecing procedure here previously inserted another inference var into same `InferenceTable`. But after that, the projection type made from the above then passed to the following function; https://github.com/rust-lang/rust-analyzer/blob/78c2bdce860dbd996a8083224d01a96660dd6a15/crates/hir-ty/src/traits.rs#L88-L96 here, a whole new `InferenceTable` is made, without any inference var and in the L94, this table calls; https://github.com/rust-lang/rust-analyzer/blob/78c2bdce860dbd996a8083224d01a96660dd6a15/crates/hir-ty/src/infer/unify.rs#L364-L370 And while registering `AliasEq` `obligation`, this obligation contains inference var `?1` made from the previous table, but this table has only one inference var `?0` made at L365. So, the chalk panics when we try to canonicalize that obligation to register it, because the obligation contains an inference var `?1` that the canonicalizing table doesn't have. Currently, we are calling `InferenceTable::new()` to do some normalizing, unifying or coercing things to some targets that might contain inference var that the new table doesn't have. I think that this is quite dangerous footgun because the inference var is just an index that does not contain the information which table does it made from, so sometimes this "foreign" index might cause panic like this case, or point at the wrong variable. This PR mitigates such behaviour simply by inserting sufficient number of inference vars to new table to avoid such problem. This strategy doesn't harm current r-a's intention because the inference vars that passed into new tables are just "unresolved" variables in current r-a, so this is just making sure that such "unresolved" variables exist in the new table

fix: Panic while hovering associated function with type annotation on generic param that not inherited from its container type Fixes rust-lang#17871 We call `generic_args_sans_defaults` here; https://github.com/rust-lang/rust-analyzer/blob/64a140527b383e3a2fe95908881624fc5374c60c/crates/hir-ty/src/display.rs#L1021-L1034 but the following substitution inside that function panic in rust-lang#17871; https://github.com/rust-lang/rust-analyzer/blob/64a140527b383e3a2fe95908881624fc5374c60c/crates/hir-ty/src/display.rs#L1468 it's because the `Binders.binder` inside `default_parameters` has a same length with the generics of the function we are hovering on, but the generics of it is split into two, `fn_params` and `parent_params`. Because of this, it may panic if the function has one or more default parameters and both `fn_params` and `parent_params` are non-empty, like the case in the title of this PR. So, we must call `generic_args_sans_default` first and then split it into `fn_params` and `parent_params`

…kril internal: Properly check the edition for edition dependent syntax kinds This puts the current edition in a bunch of places, most of which I annoted with FIXMEs asside from the ones in ide-assists because I couldnt bother with those

Assuming it isn't cancelled. Closes rust-lang#17902. The only place CommandHandle::join is used is when the flycheck command finishes, so this commit changes the behavior of the method itself.

…zyCell/Lock This doesn't get rid of the once_cell dependency, unfortunately, since we have dependencies that use it, but it's a nice to do cleanup. And when our deps will eventually get rid of once_cell we will get rid of it for free.

This speeds up short identifiers search significantly, while unlikely to have an effect on long identifiers (the analysis takes much longer than some character comparison). Tested by finding all references to `eq()` (from `PartialEq`) in the rust-analyzer repo. Total time went down from 100s to 10s (a 10x reduction!).

internal: Replace once_cell with std's recently stabilized OnceCell/Lock and LazyCell/Lock This doesn't get rid of the once_cell dependency, unfortunately, since we have dependencies that use it, but it's a nice to do cleanup. And when our deps will eventually get rid of once_cell we will get rid of it for free.

…s, r=Veykril Test for word boundary in `FindUsages` This speeds up short identifiers search significantly, while unlikely to have an effect on long identifiers (the analysis takes much longer than some character comparison). Tested by finding all references to `eq()` (from `PartialEq`) in the rust-analyzer repo. Total time went down from 100s to 10s (a 10x reduction!). Feel free to close this if you consider this a non-issue, as most short identifiers are local.

Allow flycheck process to exit gracefully Assuming it isn't cancelled. Closes rust-lang#17902. The only place CommandHandle::join() is used is when the flycheck command finishes, so this commit changes the behavior of the method itself. The only reason I can see for the existing behavior is if the command is somehow holding onto a build lock longer than it should, this would force it to be released. But it would be a pretty heavy-handed way to solve that issue. I'm not aware of this occurring in practice.

Implement lifetime inferring

This PR touches a lot of parts. But the main changes are changing `hir_expand::Name` to be raw edition-dependently and only when necessary (unrelated to how the user originally wrote the identifier), and changing `is_keyword()` and `is_raw_identifier()` to be edition-aware (this was done in rust-lang#17896, but the FIXMEs were fixed here). It is possible that I missed some cases, but most IDE parts should properly escape (or not escape) identifiers now. The rules of thumb are: - If we show the identifier to the user, its rawness should be determined by the edition of the edited crate. This is nice for IDE features, but really important for changes we insert to the source code. - For tests, I chose `Edition::CURRENT` (so we only have to (maybe) update tests when an edition becomes stable, to avoid churn). - For debugging tools (helper methods and logs), I used `Edition::LATEST`.

…-keyword, r=Veykril fix: Properly account for editions in names This PR touches a lot of parts. But the main changes are changing `hir_expand::Name` to be raw edition-dependently and only when necessary (unrelated to how the user originally wrote the identifier), and changing `is_keyword()` and `is_raw_identifier()` to be edition-aware (this was done in rust-lang#17896, but the FIXMEs were fixed here). It is possible that I missed some cases, but most IDE parts should properly escape (or not escape) identifiers now. The rules of thumb are: - If we show the identifier to the user, its rawness should be determined by the edition of the edited crate. This is nice for IDE features, but really important for changes we insert to the source code. - For tests, I chose `Edition::CURRENT` (so we only have to (maybe) update tests when an edition becomes stable, to avoid churn). - For debugging tools (helper methods and logs), I used `Edition::LATEST`. Reviewing notes: This is a really big PR but most of it is mechanical translation. I changed `Name` displayers to require an edition, and followed the compiler errors. Most methods just propagate the edition requirement. The interesting cases are mostly in `ide-assists`, as sometimes the correct crate to fetch the edition from requires awareness (there may be two). `ide-completions` and `ide-diagnostics` were solved pretty easily by introducing an edition field to their context. `ide` contains many features, for most of them it was propagated to the top level function and there the edition was fetched based on the file. I also fixed all FIXMEs from rust-lang#17896. Some required introducing an edition parameter (usually not for many methods after the changes to `Name`), some were changed to a new method `is_any_identifier()` because they really want any possible keyword. Fixes rust-lang#17895. Fixes rust-lang#17774.

…r=davidbarsky Add scip/lsif flag to exclude vendored libaries rust-lang#17809 changed StaticIndex to include vendored libraries. This PR adds a flag to disable that behavior. At work, our monorepo has too many rust targets to index all at once, so we split them up into several shards. Since all of our libraries are vendored, if rust-analyzer includes them, sharding no longer has much benefit, because every shard will have to index the entire transitive dependency graphs of all of its targets. We get around the issue presented in rust-lang#17809 because some other shard will index the libraries directly.

…, r=lnicola Remove rust-analyzer.workspace.discoverProjectRunner The functionality for this vscode config option was removed in rust-lang#17395, so it doesn't do anything anymore.

Pin `rowan` to `0.15.15` To prevent rust-lang#17914, I think that it would be safer pinning this before we fix it correctly

…t generics

…kingjubilee Rollup of 9 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129642 (Bump backtrace to 0.3.74~ish) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) - rust-lang#129723 (Simplify some extern providers) - rust-lang#129724 (Remove `Option<!>` return types.) - rust-lang#129725 (Stop using `ty::GenericPredicates` for non-predicates_of queries) - rust-lang#129733 (Subtree update of `rust-analyzer`) - rust-lang#129751 (interpret/visitor: make memory order iteration slightly more efficient) r? `@ghost` `@rustbot` modify labels: rollup

Veykril · 2024-08-30T10:32:59Z

The beta branching happened yesterday (I think?) So we need to backport this once merged as this contains a fix for a problematic proc-macro server issue rust-lang/rust-analyzer#17986

…kingjubilee Rollup of 9 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129642 (Bump backtrace to 0.3.74~ish) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) - rust-lang#129723 (Simplify some extern providers) - rust-lang#129724 (Remove `Option<!>` return types.) - rust-lang#129725 (Stop using `ty::GenericPredicates` for non-predicates_of queries) - rust-lang#129733 (Subtree update of `rust-analyzer`) - rust-lang#129751 (interpret/visitor: make memory order iteration slightly more efficient) r? `@ghost` `@rustbot` modify labels: rollup

Subtree update of `rust-analyzer` r? `@ghost`

…kingjubilee Rollup of 3 pull requests Successful merges: - rust-lang#129642 (Bump backtrace to 0.3.74~ish) - rust-lang#129733 (Subtree update of `rust-analyzer`) - rust-lang#129785 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Subtree update of `rust-analyzer` r? ``@ghost``

Subtree update of `rust-analyzer` r? ```@ghost```

…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#129630 (Document the broken C ABI of `wasm32-unknown-unknown`) - rust-lang#129711 (Expand NLL MIR dumps) - rust-lang#129730 (f32 docs: define 'arithmetic' operations) - rust-lang#129733 (Subtree update of `rust-analyzer`) - rust-lang#129749 (llvm-wrapper: adapt for LLVM API changes) - rust-lang#129757 (Add a test for trait solver overflow in MIR inliner cycle detection) - rust-lang#129760 (Make the "detect-old-time" UI test more representative) - rust-lang#129767 (Remove `#[macro_use] extern crate tracing`, round 4) - rust-lang#129774 (Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt) - rust-lang#129785 (Miri subtree update) - rust-lang#129791 (mark joboet as on vacation) Failed merges: - rust-lang#129777 (Add `unreachable_pub`, round 4) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 12 pull requests Successful merges: - rust-lang#129659 (const fn stability checking: also check declared language features) - rust-lang#129711 (Expand NLL MIR dumps) - rust-lang#129730 (f32 docs: define 'arithmetic' operations) - rust-lang#129733 (Subtree update of `rust-analyzer`) - rust-lang#129749 (llvm-wrapper: adapt for LLVM API changes) - rust-lang#129757 (Add a test for trait solver overflow in MIR inliner cycle detection) - rust-lang#129760 (Make the "detect-old-time" UI test more representative) - rust-lang#129767 (Remove `#[macro_use] extern crate tracing`, round 4) - rust-lang#129774 (Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt) - rust-lang#129785 (Miri subtree update) - rust-lang#129791 (mark joboet as on vacation) - rust-lang#129812 (interpret, codegen: tweak some comments and checks regarding Box with custom allocator) Failed merges: - rust-lang#129777 (Add `unreachable_pub`, round 4) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#129733 - lnicola:sync-from-ra, r=lnicola Subtree update of `rust-analyzer` r? ````@ghost````

workingjubilee · 2024-08-31T19:37:33Z

tagging per #129733 (comment) but maybe backporting a more minimal diff is more apropos? idk.

Veykril · 2024-08-31T19:57:18Z

rust-lang/rust-analyzer#17994 is the fix in this pull which should backport cleanly

with the rust-analyzer team lead hat on:
@rustbot label +beta-accepted

compiler-errors · 2024-08-31T20:30:25Z

@Veykril @lnicola: Can you identity the subset of commits that are needed to fix whatever beta issue? Those probably should be cherry-picked onto beta rather than this whole subtree sync. I fear that this will not merge cleanly on given that it contains a ton of other unrelated changes.

compiler-errors · 2024-08-31T20:30:41Z

Ah, I misread the linked PR :D

For whoever wants it, rust-lang/rust-analyzer#17994 corresponds to r-l/rust commits:

14ec120
03d6745
(the merge which probably doesnt need to be cherry-picked) 266bb1f

lnicola · 2024-09-01T15:40:58Z

Just to be sure, I don't need to do anything here because someone will file a rollup backport PR which includes this?

Veykril · 2024-09-02T14:43:10Z

Okay, looking into trying to backport the commits it turns out I mixed things up, the current beta branch does not contain this issue. Whatever branched off on the 30th of August should have the problem though.

@rustbot label -beta-accepted -beta-nominated

alibektas and others added 30 commits August 1, 2024 02:38

Add new assist toggle_macro_delimiter

c1245e1

Make toggle_macro_delimiters work only for macro_calls

662f02f

Allow declaring cfg groups in rust-project.json, to help sharing comm…

aa6e8d3

…on cfgs

docs: Add a doc comment for OpQueue

5e058db

Add an explanatory sentence and some sample code to help readers understand why this struct exists.

Auto merge of rust-lang#17885 - Wilfred:op_queue_docs, r=lnicola

54ecca0

minor: Add a doc comment for OpQueue Add an explanatory sentence and some sample code to help readers understand why this struct exists.

Be more resilient to bad language item definitions in binop inference

4a14155

fix: Panic while canonicalizing erroneous projection type

81b68b2

fix: Panic while displaying associated function with a type annotation

b0183f8

internal: Properly check the edition for edition dependent syntax kinds

a783e30

Add scip/lsif flag to exclude vendored libaries

bf4d31d

Allow flycheck process to exit gracefully

23c8dcd

Assuming it isn't cancelled. Closes rust-lang#17902. The only place CommandHandle::join is used is when the flycheck command finishes, so this commit changes the behavior of the method itself.

implement basic inferring of lifetimes

4ca597a

Auto merge of rust-lang#17595 - dfireBird:infer-lt, r=flodiebold

2071778

Implement lifetime inferring

Remove rust-analyzer.workspace.discoverProjectRunner

6fc487d

Auto merge of rust-lang#17909 - darichey:remove-discoverProjectRunner…

01245bd

…, r=lnicola Remove rust-analyzer.workspace.discoverProjectRunner The functionality for this vscode config option was removed in rust-lang#17395, so it doesn't do anything anymore.

Pin rowan to 0.15.15

d3fa5e9

Auto merge of rust-lang#17917 - ShoyuVanilla:pin-rowan, r=lnicola

d2d41b4

Pin `rowan` to `0.15.15` To prevent rust-lang#17914, I think that it would be safer pinning this before we fix it correctly

fix: Wrong BoundVar index when lowering impl trait parameter of paren…

c4b8c65

…t generics

workingjubilee mentioned this pull request Aug 31, 2024

Rollup of 3 pull requests #129801

Closed

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Aug 31, 2024

Rollup merge of rust-lang#129733 - lnicola:sync-from-ra, r=lnicola

a8616b9

Subtree update of `rust-analyzer` r? `@ghost`

matthiaskrgr mentioned this pull request Aug 31, 2024

Rollup of 17 pull requests #129807

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 31, 2024

Rollup merge of rust-lang#129733 - lnicola:sync-from-ra, r=lnicola

7b918eb

Subtree update of `rust-analyzer` r? ``@ghost``

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 31, 2024

Rollup merge of rust-lang#129733 - lnicola:sync-from-ra, r=lnicola

e908939

Subtree update of `rust-analyzer` r? ```@ghost```

matthiaskrgr mentioned this pull request Aug 31, 2024

Rollup of 11 pull requests #129810

Closed

matthiaskrgr mentioned this pull request Aug 31, 2024

Rollup of 12 pull requests #129817

Merged

bors merged commit a00bd75 into rust-lang:master Aug 31, 2024
6 of 7 checks passed

rustbot added this to the 1.82.0 milestone Aug 31, 2024

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024

Unrolled build for rust-lang#129733

8fcd87d

Rollup merge of rust-lang#129733 - lnicola:sync-from-ra, r=lnicola Subtree update of `rust-analyzer` r? ````@ghost````

workingjubilee added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 31, 2024

rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 31, 2024

lnicola deleted the sync-from-ra branch September 1, 2024 06:59

rustbot removed beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Sep 2, 2024

jieyouxu added the CI-spurious-fail-msvc CI spurious failure: target env msvc label Oct 15, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Subtree update of `rust-analyzer` #129733

Subtree update of `rust-analyzer` #129733

lnicola commented Aug 29, 2024

Veykril commented Aug 30, 2024 •

edited

Loading

workingjubilee commented Aug 31, 2024

Veykril commented Aug 31, 2024 •

edited

Loading

compiler-errors commented Aug 31, 2024

compiler-errors commented Aug 31, 2024 •

edited

Loading

lnicola commented Sep 1, 2024

Veykril commented Sep 2, 2024

Subtree update of rust-analyzer #129733

Subtree update of rust-analyzer #129733

Conversation

lnicola commented Aug 29, 2024

Veykril commented Aug 30, 2024 • edited Loading

workingjubilee commented Aug 31, 2024

Veykril commented Aug 31, 2024 • edited Loading

compiler-errors commented Aug 31, 2024

compiler-errors commented Aug 31, 2024 • edited Loading

lnicola commented Sep 1, 2024

Veykril commented Sep 2, 2024

Subtree update of `rust-analyzer` #129733

Subtree update of `rust-analyzer` #129733

Veykril commented Aug 30, 2024 •

edited

Loading

Veykril commented Aug 31, 2024 •

edited

Loading

compiler-errors commented Aug 31, 2024 •

edited

Loading