Auto merge of #52592 - eddyb:or-default, r=Mark-Simulacrum

Use the new Entry::or_default method where possible.

2 files changed, 4 insertions, 5 deletions

diff --git a/src/librustc_codegen_llvm/back/symbol_export.rs b/src/librustc_codegen_llvm/back/symbol_export.rs
index c78d061a39b..edb1da0b558 100644
--- a/src/librustc_codegen_llvm/back/symbol_export.rs
+++ b/src/librustc_codegen_llvm/back/symbol_export.rs
@@ -299,7 +299,7 @@ fn upstream_monomorphizations_provider<'a, 'tcx>(
 
     let cnums = tcx.all_crate_nums(LOCAL_CRATE);
 
-    let mut instances = DefIdMap();
+    let mut instances: DefIdMap<FxHashMap<_, _>> = DefIdMap();
 
     let cnum_stable_ids: IndexVec<CrateNum, Fingerprint> = {
         let mut cnum_stable_ids = IndexVec::from_elem_n(Fingerprint::ZERO,
@@ -318,8 +318,7 @@ fn upstream_monomorphizations_provider<'a, 'tcx>(
     for &cnum in cnums.iter() {
         for &(ref exported_symbol, _) in tcx.exported_symbols(cnum).iter() {
             if let &ExportedSymbol::Generic(def_id, substs) = exported_symbol {
-                let substs_map = instances.entry(def_id)
-                                          .or_insert_with(|| FxHashMap());
+                let substs_map = instances.entry(def_id).or_default();
 
                 match substs_map.entry(substs) {
                     Occupied(mut e) => {
diff --git a/src/librustc_codegen_llvm/base.rs b/src/librustc_codegen_llvm/base.rs
index bd0c62e4766..0330a059826 100644
--- a/src/librustc_codegen_llvm/base.rs
+++ b/src/librustc_codegen_llvm/base.rs
@@ -1020,12 +1020,12 @@ fn collect_and_partition_mono_items<'a, 'tcx>(
     }).collect();
 
     if tcx.sess.opts.debugging_opts.print_mono_items.is_some() {
-        let mut item_to_cgus = FxHashMap();
+        let mut item_to_cgus: FxHashMap<_, Vec<_>> = FxHashMap();
 
         for cgu in &codegen_units {
             for (&mono_item, &linkage) in cgu.items() {
                 item_to_cgus.entry(mono_item)
-                            .or_insert(Vec::new())
+                            .or_default()
                             .push((cgu.name().clone(), linkage));
             }
         }