diff options
| author | bors <bors@rust-lang.org> | 2025-09-13 04:21:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-13 04:21:44 +0000 |
| commit | 9642c0ef6749e57ce76ac153807df1cc38cd26ee (patch) | |
| tree | 5a7a8696d8b409c35263e190fe04bf6287a2cd24 /compiler/rustc_trait_selection | |
| parent | 4ba1cf9ade4c8e2fa10676a50ee34594eb161837 (diff) | |
| parent | ec0f3bd2edb427a27bac20b1ac7c7a5bd842bd37 (diff) | |
| download | rust-9642c0ef6749e57ce76ac153807df1cc38cd26ee.tar.gz rust-9642c0ef6749e57ce76ac153807df1cc38cd26ee.zip | |
Auto merge of #146494 - jdonszelmann:rollup-0bbwwwf, r=jdonszelmann
Rollup of 5 pull requests Successful merges: - rust-lang/rust#146389 (Convert `no_std` and `no_core` to the new attribute infrastructure) - rust-lang/rust#146403 (sort array trait implementation suggestions correctly) - rust-lang/rust#146452 (Improve `alloc::Layout` coverage) - rust-lang/rust#146477 (Improve `core::char` coverage) - rust-lang/rust#146481 (Improve `core::hash` coverage) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection')
| -rw-r--r-- | compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs b/compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs index c82043f0222..149f5e638b1 100644 --- a/compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs +++ b/compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs @@ -27,8 +27,8 @@ use rustc_middle::ty::print::{ with_forced_trimmed_paths, }; use rustc_middle::ty::{ - self, TraitRef, Ty, TyCtxt, TypeFoldable, TypeFolder, TypeSuperFoldable, TypeVisitableExt, - Upcast, + self, GenericArgKind, TraitRef, Ty, TyCtxt, TypeFoldable, TypeFolder, TypeSuperFoldable, + TypeVisitableExt, Upcast, }; use rustc_middle::{bug, span_bug}; use rustc_span::{BytePos, DUMMY_SP, STDLIB_STABLE_CRATES, Span, Symbol, sym}; @@ -2316,7 +2316,19 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> { cand }) .collect(); - impl_candidates.sort_by_key(|cand| (cand.similarity, cand.trait_ref.to_string())); + impl_candidates.sort_by_key(|cand| { + // When suggesting array types, sort them by the length of the array, not lexicographically (#135098) + let len = if let GenericArgKind::Type(ty) = cand.trait_ref.args[0].kind() + && let ty::Array(_, len) = ty.kind() + { + // Deprioritize suggestions for parameterized arrays. + len.try_to_target_usize(self.tcx).unwrap_or(u64::MAX) + } else { + 0 + }; + + (cand.similarity, len, cand.trait_ref.to_string()) + }); let mut impl_candidates: Vec<_> = impl_candidates.into_iter().map(|cand| cand.trait_ref).collect(); impl_candidates.dedup(); |
