Do some suggested changes, push to show compilation errors.

Author: hameerabbasi

compiler/rustc_codegen_ssa/src/base.rs

@@ -910,17 +910,14 @@ pub fn provide(providers: &mut Providers) {
         };
 
         let (defids, _) = tcx.collect_and_partition_mono_items(cratenum);
-        for id in defids.sorted_vector() {
+        if defids.any(|x| {
             let CodegenFnAttrs { optimize, .. } = tcx.codegen_fn_attrs(*id);
-            match optimize {
-                attr::OptimizeAttr::None => continue,
-                attr::OptimizeAttr::Size => continue,
-                attr::OptimizeAttr::Speed => {
-                    return for_speed;
-                }
-            }
+            optimize == attr::OptimizeAttr::Speed
+        }) {
+            for_speed
+        } else {
+            tcx.sess.opts.optimize
         }
-        tcx.sess.opts.optimize
     };
 }
 

compiler/rustc_data_structures/src/stable_set.rs

@@ -102,6 +102,22 @@ impl<T: Hash + Eq> StableSet<T> {
     pub fn contains(&self, value: &T) -> bool {
         self.base.contains(value)
     }
+
+    #[inline]
+    pub fn any<F>(&self, f: F) -> bool
+    where
+        F: FnMut(&T) -> bool,
+    {
+        self.base.iter().any(f)
+    }
+
+    #[inline]
+    pub fn all<F>(&self, f: F) -> bool
+    where
+        F: FnMut(&T) -> bool,
+    {
+        self.base.iter().all(f)
+    }
 }
 
 impl<T, HCX> HashStable<HCX> for StableSet<T>

compiler/rustc_middle/src/middle/stability.rs

@@ -7,13 +7,12 @@ use crate::ty::{self, DefIdTree, TyCtxt};
 use rustc_ast::NodeId;
 use rustc_attr::{self as attr, ConstStability, Deprecation, Stability};
 use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::stable_set::StableSet;
 use rustc_errors::{Applicability, Diagnostic};
 use rustc_feature::GateIssue;
 use rustc_hir as hir;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId, LocalDefId, CRATE_DEF_INDEX};
-use rustc_hir::{self, def_id::CrateNum, HirId};
+use rustc_hir::{self, HirId};
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_session::lint::builtin::{DEPRECATED, DEPRECATED_IN_FUTURE, SOFT_UNSTABLE};
 use rustc_session::lint::{BuiltinLintDiagnostics, Level, Lint, LintBuffer};
@@ -64,12 +63,6 @@ pub struct Index {
     pub stab_map: FxHashMap<LocalDefId, Stability>,
     pub const_stab_map: FxHashMap<LocalDefId, ConstStability>,
     pub depr_map: FxHashMap<LocalDefId, DeprecationEntry>,
-
-    /// Maps for each crate whether it is part of the staged API.
-    pub staged_api: FxHashMap<CrateNum, bool>,
-
-    /// Features enabled for this crate.
-    pub active_features: StableSet<Symbol>,
 }
 
 impl Index {

compiler/rustc_middle/src/ty/context.rs

@@ -31,7 +31,7 @@ use rustc_data_structures::memmap::Mmap;
 use rustc_data_structures::profiling::SelfProfilerRef;
 use rustc_data_structures::sharded::{IntoPointer, ShardedHashMap};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
-use rustc_data_structures::stable_set::StableSet;
+use rustc_data_structures::stable_set::{FxHashSet, StableSet};
 use rustc_data_structures::steal::Steal;
 use rustc_data_structures::sync::{self, Lock, Lrc, WorkerLocal};
 use rustc_data_structures::vec_map::VecMap;
@@ -2209,7 +2209,7 @@ impl<'tcx> TyCtxt<'tcx> {
     /// to identify which traits may define a given associated type to help avoid cycle errors.
     /// Returns a `DefId` iterator.
     fn super_traits_of(self, trait_def_id: DefId) -> impl Iterator<Item = DefId> + 'tcx {
-        let mut set = StableSet::default();
+        let mut set = FxHashSet::default();
         let mut stack = vec![trait_def_id];
 
         set.insert(trait_def_id);

compiler/rustc_middle/src/ty/mod.rs

@@ -18,7 +18,6 @@ pub use adt::*;
 pub use assoc::*;
 pub use generics::*;
 use rustc_data_structures::fingerprint::Fingerprint;
-use rustc_data_structures::stable_set::StableSet;
 pub use vtable::*;
 
 use crate::metadata::ModChild;
@@ -136,7 +135,7 @@ pub struct ResolverOutputs {
     pub maybe_unused_trait_imports: FxHashSet<LocalDefId>,
     pub maybe_unused_extern_crates: Vec<(LocalDefId, Span)>,
     pub reexport_map: FxHashMap<LocalDefId, Vec<ModChild>>,
-    pub glob_map: FxHashMap<LocalDefId, StableSet<Symbol>>,
+    pub glob_map: FxHashMap<LocalDefId, FxHashSet<Symbol>>,
     /// Extern prelude entries. The value is `true` if the entry was introduced
     /// via `extern crate` item and not `--extern` option or compiler built-in.
     pub extern_prelude: FxHashMap<Symbol, bool>,

compiler/rustc_middle/src/ty/print/pretty.rs

@@ -2765,7 +2765,7 @@ fn trimmed_def_paths(tcx: TyCtxt<'_>, (): ()) -> FxHashMap<DefId, Symbol> {
 
     let hcx = tcx.create_stable_hashing_context();
     for symbol_set in tcx.resolutions(()).glob_map.values() {
-        for symbol in symbol_set.sorted_vector(&hcx) {
+        for symbol in symbol_set {
             unique_symbols_rev.insert((Namespace::TypeNS, *symbol), None);
             unique_symbols_rev.insert((Namespace::ValueNS, *symbol), None);
             unique_symbols_rev.insert((Namespace::MacroNS, *symbol), None);