Skip to content

Commit 13959bf

Browse files
NoratriebNoratrieb
committed
Avoid iterating over hashmaps in astconv
1 parent 097261f commit 13959bf

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

‎compiler/rustc_hir_analysis/src/astconv/errors.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::errors::{
44
ParenthesizedFnTraitExpansion,
55
};
66
use crate::traits::error_reporting::report_object_safety_error;
7-
use rustc_data_structures::fx::FxHashMap;
7+
use rustc_data_structures::fx::{FxHashMap, FxIndexMap, FxIndexSet};
88
use rustc_errors::{pluralize, struct_span_err, Applicability, Diagnostic, ErrorGuaranteed};
99
use rustc_hir as hir;
1010
use rustc_hir::def_id::{DefId, LocalDefId};
@@ -16,8 +16,6 @@ use rustc_span::symbol::{sym, Ident};
1616
use rustc_span::{Span, Symbol, DUMMY_SP};
1717
use rustc_trait_selection::traits::object_safety_violations_for_assoc_item;
1818

19-
use std::collections::BTreeSet;
20-
2119
impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
2220
/// On missing type parameters, emit an E0393 error and provide a structured suggestion using
2321
/// the type parameter's name as a placeholder.
@@ -504,7 +502,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
504502
/// emit a generic note suggesting using a `where` clause to constraint instead.
505503
pub(crate) fn complain_about_missing_associated_types(
506504
&self,
507-
associated_types: FxHashMap<Span, BTreeSet<DefId>>,
505+
associated_types: FxIndexMap<Span, FxIndexSet<DefId>>,
508506
potential_assoc_types: Vec<Span>,
509507
trait_bounds: &[hir::PolyTraitRef<'_>],
510508
) {
@@ -514,13 +512,13 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
514512
let tcx = self.tcx();
515513
// FIXME: Marked `mut` so that we can replace the spans further below with a more
516514
// appropriate one, but this should be handled earlier in the span assignment.
517-
let mut associated_types: FxHashMap<Span, Vec<_>> = associated_types
515+
let mut associated_types: FxIndexMap<Span, Vec<_>> = associated_types
518516
.into_iter()
519517
.map(|(span, def_ids)| {
520518
(span, def_ids.into_iter().map(|did| tcx.associated_item(did)).collect())
521519
})
522520
.collect();
523-
let mut names: FxHashMap<String, Vec<Symbol>> = Default::default();
521+
let mut names: FxIndexMap<String, Vec<Symbol>> = Default::default();
524522
let mut names_len = 0;
525523

526524
// Account for things like `dyn Foo + 'a`, like in tests `issue-22434.rs` and

‎compiler/rustc_hir_analysis/src/astconv/object_safety.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::astconv::{GenericArgCountMismatch, GenericArgCountResult, OnlySelfBounds};
22
use crate::bounds::Bounds;
33
use crate::errors::TraitObjectDeclaredWithNoTraits;
4-
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
4+
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
55
use rustc_errors::struct_span_err;
66
use rustc_hir as hir;
77
use rustc_hir::def::{DefKind, Res};
@@ -14,7 +14,6 @@ use rustc_trait_selection::traits::error_reporting::report_object_safety_error;
1414
use rustc_trait_selection::traits::{self, astconv_object_safety_violations};
1515

1616
use smallvec::{smallvec, SmallVec};
17-
use std::collections::BTreeSet;
1817

1918
use super::AstConv;
2019

@@ -148,8 +147,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
148147
}
149148
}
150149

151-
// Use a `BTreeSet` to keep output in a more consistent order.
152-
let mut associated_types: FxHashMap<Span, BTreeSet<DefId>> = FxHashMap::default();
150+
let mut associated_types: FxIndexMap<Span, FxIndexSet<DefId>> = FxIndexMap::default();
153151

154152
let regular_traits_refs_spans = trait_bounds
155153
.into_iter()

‎tests/ui/associated-types/missing-associated-types.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ LL | type B;
4949
LL | type Bar<Rhs> = dyn Add<Rhs> + Sub<Rhs> + X<Rhs> + Z<Rhs>;
5050
| ^^^^^^^^ ^^^^^^^^ ^^^^^^ ^^^^^^ associated types `A`, `B`, `Output` must be specified
5151
| | | |
52-
| | | associated types `Output` (from trait `Mul`), `Output` (from trait `Div`) must be specified
52+
| | | associated types `Output` (from trait `Div`), `Output` (from trait `Mul`) must be specified
5353
| | associated type `Output` must be specified
5454
| associated type `Output` must be specified
5555
|
@@ -119,7 +119,7 @@ error[E0191]: the value of the associated types `Output` in `Div`, `Output` in `
119119
--> $DIR/missing-associated-types.rs:24:21
120120
|
121121
LL | type Bal<Rhs> = dyn X<Rhs>;
122-
| ^^^^^^ associated types `Output` (from trait `Mul`), `Output` (from trait `Div`) must be specified
122+
| ^^^^^^ associated types `Output` (from trait `Div`), `Output` (from trait `Mul`) must be specified
123123
|
124124
= help: consider introducing a new type parameter, adding `where` constraints using the fully-qualified path to the associated types
125125

0 commit comments

Comments
 (0)