Convert rust-analyzer to an in-tree tool #99603
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix: typos in hir-ty
…Veykril fix: complete enum variants as patterns in pattern path close rust-lang#12593
fix regressions on assignment expressions This is a follow-up PR on rust-lang#12428. I'm not sure if this is everything I overlooked, so if there are more things that are not right, we may want to revert rust-lang#12428. This should also fix the increase of the type mismatches and the unknown types in diesel in the [metrics](https://rust-analyzer.github.io/metrics/?start=2022-06-23&end=2022-07-01) introduced by rust-lang#12428. The regressions are: - some coercions don't work in the ordinary (i.e. non-destructuring) assignments In order for coercions on ADT fields instantiations to work, lhs type has to be known before inferring rhs. rust-lang#12428 changed the inference order, making rhs inferred before lhs, breaking the coercion, so I restored the original inference mechanism for the ordinary assignments. Note that this kind of coercion doesn't happen in destructuring assigments, because when they are desugared, the struct expression is first assigned to a temporary, which is then assigned to the assignee, which is not coercion site anymore. - type mismatches on individual identifiers are not reported
This change fixes issue rust-lang#10037, in more or less the most naive fashion possible. We continue to start with the hardcoded default of "fun_name", and now append a counter to the end of it if that name is already in scope. In the future, we can probably apply more heuristics here to wind up with more useful names by default, but for now this resolves the immediate problem.
…on-duplicate-name, r=DorianListens fix: Extract Function produces duplicate fn names This change fixes rust-lang#10037, in more or less the most naive fashion possible. We continue to start with the hardcoded default of "fun_name", and now append a counter to the end of it if that name is already in scope. In the future, we can probably apply more heuristics here to wind up with more useful names by default, but for now this resolves the immediate problem.
This change fixes rust-lang#10036, "Extract to function assist implements nonexistent trait methods". When we detect that the extraction is coming from within a trait impl, and that a `self` param will be necessary, we adjust which `SyntaxNode` to `insert_after`, and create a new empty `impl` block for the newly extracted function.
Improve documentation for `buildScripts.overrideCommand` / `checkOnSave.overrideCommand`
|
@lnicola reports 2 tests still failing: https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/git.20subtree.3A.20last.20stretch @bors r- |
bors
added
S-waiting-on-author
|
@bors r=jyn514 |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (3ae03e0): comparison url. Instruction count
Max RSS (memory usage)Results
CyclesResults
If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf. @rustbot label: -perf-regression Footnotes |
This was referenced Jul 25, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This re-adds
rust-lang/rust-analyzeras a git subtree rather than a submodule.Closes rust-lang/rust-analyzer#12815.
Prior attempt (research PR): #99465
git rm -f src/tools/rust-analyzergit subtree add -P src/tools/rust-analyzer https://github.com/rust-lang/rust-analyzer.git masterSourceType::InTree,rust-analyzer/in-rust-treefeature when built throughx.pyWith this PR, rust-analyzer becomes an "in-tree" tool. Syncs can happen in both directions, see clippy's relevant book section.
Making sure
proc-macro-srvdoesn't break when the proc_macro bridge changes effectively becomes the responsibility ofrust-lang/rustcontributors. These days, that's mostly @mystor, who has been consulted throughout the process. I'm also making myself available in case there's questions / work needed that nobody else signed up for.This doesn't change rust-analyzer's release cycle. After this PR is merged and the next nightly goes out, one can point
rust-analyzer.procMacro.serverto the rustup-providedrust-analyzerbinary. Changes to improve the situation further (auto-discovery/install of the rust-analyzer component) will happen inrust-lang/rust-analyzerand be synced here eventually.