Skip to content

Migrate merge imports to editor - #22351

Merged
Veykril merged 11 commits into
rust-lang:masterfrom
bit-aloo:2026-05-10-migrate-merge-imports-to-editor
Jun 20, 2026
Merged

Migrate merge imports to editor#22351
Veykril merged 11 commits into
rust-lang:masterfrom
bit-aloo:2026-05-10-migrate-merge-imports-to-editor

Conversation

@bit-aloo

Copy link
Copy Markdown
Member

part of #15710 and #18285

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 12, 2026
@bit-aloo
bit-aloo force-pushed the 2026-05-10-migrate-merge-imports-to-editor branch 4 times, most recently from d144bca to 935f981 Compare May 13, 2026 04:34
@bit-aloo
bit-aloo requested a review from ChayimFriedman2 May 14, 2026 05:42

@ChayimFriedman2 ChayimFriedman2 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not reviewed all of the code yet, only most of it.

View changes since this review

Comment thread crates/syntax/src/ast/edit.rs Outdated
Comment thread crates/ide-assists/src/handlers/merge_imports.rs Outdated
Comment thread crates/ide-assists/src/handlers/merge_imports.rs Outdated
Comment thread crates/ide-db/src/imports/merge_imports.rs Outdated
Comment thread crates/ide-db/src/imports/merge_imports.rs Outdated
@bit-aloo
bit-aloo force-pushed the 2026-05-10-migrate-merge-imports-to-editor branch from 935f981 to d1fc4ad Compare May 25, 2026 17:34
@bit-aloo
bit-aloo requested a review from ChayimFriedman2 May 25, 2026 17:46
@bit-aloo
bit-aloo force-pushed the 2026-05-10-migrate-merge-imports-to-editor branch from d1fc4ad to f5e3520 Compare May 26, 2026 06:09
@bit-aloo
bit-aloo force-pushed the 2026-05-10-migrate-merge-imports-to-editor branch from f5e3520 to d800e4d Compare June 3, 2026 02:55
@rustbot

This comment has been minimized.

@bit-aloo bit-aloo mentioned this pull request Jun 3, 2026
@rustbot

This comment has been minimized.

@bit-aloo
bit-aloo force-pushed the 2026-05-10-migrate-merge-imports-to-editor branch from d800e4d to 0015ecd Compare June 12, 2026 09:36
@rustbot

rustbot commented Jun 12, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@bit-aloo
bit-aloo requested a review from Veykril June 14, 2026 01:35
Veykril added 3 commits June 20, 2026 17:33
…t APIs

try_merge_imports, try_merge_trees, and try_normalize_import only ever
used the editor to obtain its SyntaxFactory; they never edited through
it.
ast::edit had private inherent ast::Use::remove and
ast::UseTree::remove_with_editor methods that duplicated the

@Veykril Veykril left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed some minor nits but nothing big

View changes since this review

@Veykril
Veykril enabled auto-merge June 20, 2026 15:47
@Veykril
Veykril added this pull request to the merge queue Jun 20, 2026
Merged via the queue into rust-lang:master with commit 33865f5 Jun 20, 2026
18 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants