Skip to content

Commit 04d3f93

Browse files
authored
Rollup merge of #89224 - TaKO8Ki:change-the-order-of-suggestions, r=joshtriplett
Change the order of imports suggestions closes #83564
2 parents 653dcaa + 4c23905 commit 04d3f93

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

compiler/rustc_resolve/src/diagnostics.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1706,6 +1706,9 @@ crate fn show_candidates(
17061706
candidates.iter().map(|c| path_names_to_string(&c.path)).collect();
17071707

17081708
path_strings.sort();
1709+
let core_path_strings =
1710+
path_strings.drain_filter(|p| p.starts_with("core::")).collect::<Vec<String>>();
1711+
path_strings.extend(core_path_strings);
17091712
path_strings.dedup();
17101713

17111714
let (determiner, kind) = if candidates.len() == 1 {

compiler/rustc_resolve/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
1111
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
1212
#![feature(box_patterns)]
13+
#![feature(drain_filter)]
1314
#![feature(bool_to_option)]
1415
#![feature(crate_visibility_modifier)]
1516
#![feature(format_args_capture)]

0 commit comments

Comments
 (0)