some more fixes

Author: jyn514

compiler/rustc_data_structures/src/stable_set.rs

@@ -41,6 +41,18 @@ where
 
 impl<T> Eq for StableSet<T> where T: Eq + Hash {}
 
+impl<T: Eq + Hash> Extend<T> for StableSet<T> {
+    fn extend<I: IntoIterator<Item = T>>(&mut self, iter: I) {
+        self.base.extend(iter);
+    }
+}
+
+impl<T: Eq + Hash> std::iter::FromIterator<T> for StableSet<T> {
+    fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> Self {
+        Self { base: FxHashSet::from_iter(iter) }
+    }
+}
+
 impl<T: Eq + Hash> StableSet<T> {
     pub fn new() -> StableSet<T> {
         StableSet { base: FxHashSet::default() }

compiler/rustc_hir/src/hir_id.rs

@@ -1,4 +1,5 @@
 use crate::def_id::{LocalDefId, CRATE_DEF_INDEX};
+use rustc_data_structures::fx::FxHashMap;
 use rustc_index::vec::IndexVec;
 use std::fmt;
 
@@ -42,7 +43,8 @@ impl fmt::Display for HirId {
 }
 
 rustc_data_structures::define_id_collections!(HirIdMap, HirIdSet, HirId);
-rustc_data_structures::define_id_collections!(ItemLocalMap, ItemLocalSet, ItemLocalId);
+pub type ItemLocalMap<T> = FxHashMap<ItemLocalId, T>;
+pub type ItemLocalSet = rustc_data_structures::stable_set::StableSet<ItemLocalId>;
 
 rustc_index::newtype_index! {
     /// An `ItemLocalId` uniquely identifies something within a given "item-like";

compiler/rustc_middle/src/query/mod.rs

@@ -1276,7 +1276,7 @@ rustc_queries! {
         desc { "looking up a named region" }
     }
     query is_late_bound_map(_: LocalDefId) ->
-        Option<(LocalDefId, &'tcx FxHashSet<ItemLocalId>)> {
+        Option<(LocalDefId, &'tcx StableSet<ItemLocalId>)> {
         desc { "testing if a region is late bound" }
     }
     /// For a given item (like a struct), gets the default lifetimes to be used

compiler/rustc_middle/src/ty/query/mod.rs

@@ -33,6 +33,7 @@ use crate::ty::util::AlwaysRequiresDrop;
 use crate::ty::{self, AdtSizedConstraint, CrateInherentImpls, ParamEnvAnd, Ty, TyCtxt};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};
 use rustc_data_structures::stable_hasher::StableVec;
+use rustc_data_structures::stable_set::StableSet;
 use rustc_data_structures::steal::Steal;
 use rustc_data_structures::svh::Svh;
 use rustc_data_structures::sync::Lrc;

compiler/rustc_resolve/src/late/lifetimes.rs

@@ -9,6 +9,7 @@
 use crate::late::diagnostics::{ForLifetimeSpanType, MissingLifetimeSpot};
 use rustc_ast::walk_list;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_data_structures::stable_set::StableSet;
 use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
@@ -575,7 +576,7 @@ fn item_for(tcx: TyCtxt<'_>, local_def_id: LocalDefId) -> LocalDefId {
 fn is_late_bound_map<'tcx>(
     tcx: TyCtxt<'tcx>,
     def_id: LocalDefId,
-) -> Option<(LocalDefId, &'tcx FxHashSet<ItemLocalId>)> {
+) -> Option<(LocalDefId, &'tcx StableSet<ItemLocalId>)> {
     match tcx.def_kind(def_id) {
         DefKind::AnonConst => {
             let mut def_id = tcx
@@ -740,9 +741,9 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                                 });
                             }
                             for (&owner, late_bound) in resolved_lifetimes.late_bound.iter() {
-                                late_bound.iter().for_each(|&local_id| {
+                                for &local_id in late_bound.to_sorted_vec() {
                                     self.map.late_bound.insert(hir::HirId { owner, local_id });
-                                });
+                                }
                             }
                             for (&owner, late_bound_vars) in
                                 resolved_lifetimes.late_bound_vars.iter()