rust/crates
bors[bot] 568dc38b7b
Merge #5955
5955: Remove merge import code duplication r=jonas-schievink a=Veykril

This removes the code duplication caused by #5935, this also allows the assist to merge imports that have equal visibility and prevents merges of unequal visibility. This PR also fixes an iteration mistake in the mentioned PR:

Turns out I made a mistake when writing the `segment_iter` function, I was assuming that the `children` of a path will just be the segments, which is obviously not the case. This also brings insertion order of shorter paths in line with how `rustfmt` orders them.

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
2020-09-11 14:01:20 +00:00
..
arena Add TBD description to arena 2020-08-24 13:29:10 +02:00
assists Merge #5955 2020-09-11 14:01:20 +00:00
base_db Move most of the logic into the completion module 2020-09-10 01:42:20 +03:00
cfg Add description for crates that will be published 2020-08-24 13:07:22 +02:00
flycheck Add description for crates that will be published 2020-08-24 13:07:22 +02:00
hir Rename record_field_pat to record_pat_field 2020-09-10 18:56:04 +02:00
hir_def Move most of the logic into the completion module 2020-09-10 01:42:20 +03:00
hir_expand Move most of the logic into the completion module 2020-09-10 01:42:20 +03:00
hir_ty Rename record_field_pat to record_pat_field 2020-09-10 18:56:04 +02:00
ide Merge #5969 2020-09-11 11:37:04 +00:00
ide_db Rename record_field_pat to record_pat_field 2020-09-10 18:56:04 +02:00
mbe Add description for crates that will be published 2020-08-24 13:07:22 +02:00
parser Rename record_field_pat to record_pat_field 2020-09-10 18:56:04 +02:00
paths Add description for crates that will be published 2020-08-24 13:07:22 +02:00
proc_macro_api Add description for crates that will be published 2020-08-24 13:07:22 +02:00
proc_macro_srv Add description for crates that will be published 2020-08-24 13:07:22 +02:00
proc_macro_test Add description for crates that will be published 2020-08-24 13:07:22 +02:00
profile Add description for crates that will be published 2020-08-24 13:07:22 +02:00
project_model Report better errors in project.json/sysroot 2020-09-11 14:48:56 +02:00
rust-analyzer Report better errors in project.json/sysroot 2020-09-11 14:48:56 +02:00
ssr ⬆️ expect-test 2020-08-28 14:47:14 +02:00
stdx Add description for crates that will be published 2020-08-24 13:07:22 +02:00
syntax Rename record_field_pat to record_pat_field 2020-09-10 18:56:04 +02:00
test_utils Add description for crates that will be published 2020-08-24 13:07:22 +02:00
text_edit Actually assert disjointness 2020-09-03 13:37:36 +02:00
toolchain Add description for crates that will be published 2020-08-24 13:07:22 +02:00
tt Add description for crates that will be published 2020-08-24 13:07:22 +02:00
vfs Rename the method to avoid false promises 2020-09-10 01:45:49 +03:00
vfs-notify Add description for crates that will be published 2020-08-24 13:07:22 +02:00