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

fix: Fix import_map::search_dependencies getting confused by assoc and non assoc items with the same name #16101

Merged
merged 1 commit into from
Dec 12, 2023

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Dec 12, 2023

No test case as creating one is kind of tricky... Ideally the code should be restructured such that this collision wouldn't matter in the first place, its kind of a mess.

Fixes #16074
Fixes #16080
Fixes #15845

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 12, 2023
@Veykril
Copy link
Member Author

Veykril commented Dec 12, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Dec 12, 2023

📌 Commit ca995d7 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Dec 12, 2023

⌛ Testing commit ca995d7 with merge dd42c14...

@bors
Copy link
Contributor

bors commented Dec 12, 2023

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing dd42c14 to master...

@bors bors merged commit dd42c14 into rust-lang:master Dec 12, 2023
9 checks passed
@Veykril Veykril deleted the search-depedencies-fix branch December 12, 2023 15:13
Veykril added a commit to Veykril/rust-analyzer that referenced this pull request Dec 12, 2023
Veykril added a commit to Veykril/rust-analyzer that referenced this pull request Dec 12, 2023
bors added a commit that referenced this pull request Dec 12, 2023
internal: Partially revert #16101

#16101 has severe perf regressions unfortunately, so this reverts the part that fixed the issues for now.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
3 participants