Skip to content

Commit da622a3

Browse files
eddybeddyb
committed
rustc: remove {FxHash,Node,DefId,HirId,ItemLocal}{Map,Set} "constructor" fns.
1 parent f1e2fa8 commit da622a3

File tree

28 files changed

+72
-75
lines changed

28 files changed

+72
-75
lines changed

‎src/librustc/hir/lowering.rs

+10-7
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ pub fn lower_crate(
244244
loop_scopes: Vec::new(),
245245
is_in_loop_condition: false,
246246
anonymous_lifetime_mode: AnonymousLifetimeMode::PassThrough,
247-
type_def_lifetime_params: DefIdMap(),
247+
type_def_lifetime_params: Default::default(),
248248
current_hir_id_owner: vec![(CRATE_DEF_INDEX, 0)],
249-
item_local_id_counters: NodeMap(),
249+
item_local_id_counters: Default::default(),
250250
node_id_to_hir_id: IndexVec::new(),
251251
is_generator: false,
252252
is_in_trait_impl: false,
@@ -1168,7 +1168,7 @@ impl<'a> LoweringContext<'a> {
11681168
hir::TyKind::BareFn(P(hir::BareFnTy {
11691169
generic_params: this.lower_generic_params(
11701170
&f.generic_params,
1171-
&NodeMap(),
1171+
&NodeMap::default(),
11721172
ImplTraitContext::disallowed(),
11731173
),
11741174
unsafety: this.lower_unsafety(f.unsafety),
@@ -2467,7 +2467,7 @@ impl<'a> LoweringContext<'a> {
24672467
// FIXME: This could probably be done with less rightward drift. Also looks like two control
24682468
// paths where report_error is called are also the only paths that advance to after
24692469
// the match statement, so the error reporting could probably just be moved there.
2470-
let mut add_bounds: NodeMap<Vec<_>> = NodeMap();
2470+
let mut add_bounds: NodeMap<Vec<_>> = Default::default();
24712471
for pred in &generics.where_clause.predicates {
24722472
if let WherePredicate::BoundPredicate(ref bound_pred) = *pred {
24732473
'next_bound: for bound in &bound_pred.bounds {
@@ -2552,7 +2552,7 @@ impl<'a> LoweringContext<'a> {
25522552
hir::WherePredicate::BoundPredicate(hir::WhereBoundPredicate {
25532553
bound_generic_params: this.lower_generic_params(
25542554
bound_generic_params,
2555-
&NodeMap(),
2555+
&NodeMap::default(),
25562556
ImplTraitContext::disallowed(),
25572557
),
25582558
bounded_ty: this.lower_ty(bounded_ty, ImplTraitContext::disallowed()),
@@ -2636,8 +2636,11 @@ impl<'a> LoweringContext<'a> {
26362636
p: &PolyTraitRef,
26372637
mut itctx: ImplTraitContext<'_>,
26382638
) -> hir::PolyTraitRef {
2639-
let bound_generic_params =
2640-
self.lower_generic_params(&p.bound_generic_params, &NodeMap(), itctx.reborrow());
2639+
let bound_generic_params = self.lower_generic_params(
2640+
&p.bound_generic_params,
2641+
&NodeMap::default(),
2642+
itctx.reborrow(),
2643+
);
26412644
let trait_ref = self.with_parent_impl_lifetime_defs(
26422645
&bound_generic_params,
26432646
|this| this.lower_trait_ref(&p.trait_ref, itctx),

‎src/librustc/hir/map/definitions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ impl Definitions {
418418
index_to_key: [vec![], vec![]],
419419
def_path_hashes: [vec![], vec![]],
420420
},
421-
node_to_def_index: NodeMap(),
421+
node_to_def_index: Default::default(),
422422
def_index_to_node: [vec![], vec![]],
423423
node_to_hir_id: IndexVec::new(),
424424
parent_modules_of_macro_defs: Default::default(),

‎src/librustc/infer/opaque_types/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
121121
parent_def_id,
122122
body_id,
123123
param_env,
124-
opaque_types: DefIdMap(),
124+
opaque_types: Default::default(),
125125
obligations: vec![],
126126
};
127127
let value = instantiator.instantiate_opaque_types_in_map(value);

‎src/librustc/lint/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ pub struct LintBuffer {
496496

497497
impl LintBuffer {
498498
pub fn new() -> LintBuffer {
499-
LintBuffer { map: NodeMap() }
499+
LintBuffer { map: ::std::default::Default::default() }
500500
}
501501

502502
pub fn add_lint(&mut self,

‎src/librustc/middle/liveness.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ impl<'a, 'tcx> IrMaps<'a, 'tcx> {
272272
tcx,
273273
num_live_nodes: 0,
274274
num_vars: 0,
275-
live_node_map: HirIdMap(),
276-
variable_map: HirIdMap(),
277-
capture_info_map: NodeMap(),
275+
live_node_map: HirIdMap::default(),
276+
variable_map: HirIdMap::default(),
277+
capture_info_map: Default::default(),
278278
var_kinds: Vec::new(),
279279
lnks: Vec::new(),
280280
}
@@ -397,7 +397,7 @@ fn visit_fn<'a, 'tcx: 'a>(ir: &mut IrMaps<'a, 'tcx>,
397397
fn add_from_pat<'a, 'tcx>(ir: &mut IrMaps<'a, 'tcx>, pat: &P<hir::Pat>) {
398398
// For struct patterns, take note of which fields used shorthand
399399
// (`x` rather than `x: x`).
400-
let mut shorthand_field_ids = HirIdSet();
400+
let mut shorthand_field_ids = HirIdSet::default();
401401
let mut pats = VecDeque::new();
402402
pats.push_back(pat);
403403
while let Some(pat) = pats.pop_front() {
@@ -691,8 +691,8 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
691691
s: specials,
692692
successors: vec![invalid_node(); num_live_nodes],
693693
rwu_table: RWUTable::new(num_live_nodes * num_vars),
694-
break_ln: NodeMap(),
695-
cont_ln: NodeMap(),
694+
break_ln: Default::default(),
695+
cont_ln: Default::default(),
696696
}
697697
}
698698

‎src/librustc/middle/reachable.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ fn reachable_set<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, crate_num: CrateNum) ->
408408
let mut reachable_context = ReachableContext {
409409
tcx,
410410
tables: &ty::TypeckTables::empty(None),
411-
reachable_symbols: NodeSet(),
411+
reachable_symbols: Default::default(),
412412
worklist: Vec::new(),
413413
any_library,
414414
};

‎src/librustc/middle/resolve_lifetime.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ fn resolve_lifetimes<'tcx>(
425425
fn krate<'tcx>(tcx: TyCtxt<'_, 'tcx, 'tcx>) -> NamedRegionMap {
426426
let krate = tcx.hir.krate();
427427
let mut map = NamedRegionMap {
428-
defs: NodeMap(),
429-
late_bound: NodeSet(),
428+
defs: Default::default(),
429+
late_bound: Default::default(),
430430
object_lifetime_defaults: compute_object_lifetime_defaults(tcx),
431431
};
432432
{
@@ -437,8 +437,8 @@ fn krate<'tcx>(tcx: TyCtxt<'_, 'tcx, 'tcx>) -> NamedRegionMap {
437437
trait_ref_hack: false,
438438
is_in_fn_syntax: false,
439439
labels_in_fn: vec![],
440-
xcrate_object_lifetime_defaults: DefIdMap(),
441-
lifetime_uses: &mut DefIdMap(),
440+
xcrate_object_lifetime_defaults: Default::default(),
441+
lifetime_uses: &mut Default::default(),
442442
};
443443
for (_, item) in &krate.items {
444444
visitor.visit_item(item);
@@ -1278,7 +1278,7 @@ fn extract_labels(ctxt: &mut LifetimeContext<'_, '_>, body: &hir::Body) {
12781278
fn compute_object_lifetime_defaults(
12791279
tcx: TyCtxt<'_, '_, '_>,
12801280
) -> NodeMap<Vec<ObjectLifetimeDefault>> {
1281-
let mut map = NodeMap();
1281+
let mut map = NodeMap::default();
12821282
for item in tcx.hir.krate().items.values() {
12831283
match item.node {
12841284
hir::ItemKind::Struct(_, ref generics)
@@ -1432,7 +1432,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
14321432
} = self;
14331433
let labels_in_fn = replace(&mut self.labels_in_fn, vec![]);
14341434
let xcrate_object_lifetime_defaults =
1435-
replace(&mut self.xcrate_object_lifetime_defaults, DefIdMap());
1435+
replace(&mut self.xcrate_object_lifetime_defaults, DefIdMap::default());
14361436
let mut this = LifetimeContext {
14371437
tcx: *tcx,
14381438
map: map,

‎src/librustc/ty/context.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -446,22 +446,22 @@ impl<'tcx> TypeckTables<'tcx> {
446446
pub fn empty(local_id_root: Option<DefId>) -> TypeckTables<'tcx> {
447447
TypeckTables {
448448
local_id_root,
449-
type_dependent_defs: ItemLocalMap(),
450-
field_indices: ItemLocalMap(),
451-
user_provided_tys: ItemLocalMap(),
449+
type_dependent_defs: Default::default(),
450+
field_indices: Default::default(),
451+
user_provided_tys: Default::default(),
452452
user_provided_sigs: Default::default(),
453-
node_types: ItemLocalMap(),
454-
node_substs: ItemLocalMap(),
455-
user_substs: ItemLocalMap(),
456-
adjustments: ItemLocalMap(),
457-
pat_binding_modes: ItemLocalMap(),
458-
pat_adjustments: ItemLocalMap(),
453+
node_types: Default::default(),
454+
node_substs: Default::default(),
455+
user_substs: Default::default(),
456+
adjustments: Default::default(),
457+
pat_binding_modes: Default::default(),
458+
pat_adjustments: Default::default(),
459459
upvar_capture_map: Default::default(),
460-
closure_kind_origins: ItemLocalMap(),
461-
liberated_fn_sigs: ItemLocalMap(),
462-
fru_field_types: ItemLocalMap(),
463-
cast_kinds: ItemLocalMap(),
464-
used_trait_imports: Lrc::new(DefIdSet()),
460+
closure_kind_origins: Default::default(),
461+
liberated_fn_sigs: Default::default(),
462+
fru_field_types: Default::default(),
463+
cast_kinds: Default::default(),
464+
used_trait_imports: Lrc::new(Default::default()),
465465
tainted_by_errors: false,
466466
free_region_map: Default::default(),
467467
concrete_existential_types: Default::default(),

‎src/librustc/util/nodemap.rs

-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
//! An efficient hash map for node IDs
1212
13-
#![allow(non_snake_case)]
14-
1513
use hir::def_id::DefId;
1614
use hir::{HirId, ItemLocalId};
1715
use syntax::ast;
@@ -22,9 +20,7 @@ pub use rustc_data_structures::fx::FxHashSet;
2220
macro_rules! define_id_collections {
2321
($map_name:ident, $set_name:ident, $key:ty) => {
2422
pub type $map_name<T> = FxHashMap<$key, T>;
25-
pub fn $map_name<T>() -> $map_name<T> { Default::default() }
2623
pub type $set_name = FxHashSet<$key>;
27-
pub fn $set_name() -> $set_name { Default::default() }
2824
}
2925
}
3026

‎src/librustc_codegen_llvm/debuginfo/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl<'a, 'tcx> CrateDebugContext<'a, 'tcx> {
106106
created_files: Default::default(),
107107
created_enum_disr_types: Default::default(),
108108
type_map: Default::default(),
109-
namespace_map: RefCell::new(DefIdMap()),
109+
namespace_map: RefCell::new(Default::default()),
110110
composite_types_completed: Default::default(),
111111
}
112112
}

‎src/librustc_codegen_ssa/back/symbol_export.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fn reachable_non_generics_provider<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
6464
assert_eq!(cnum, LOCAL_CRATE);
6565

6666
if !tcx.sess.opts.output_types.should_codegen() {
67-
return Lrc::new(DefIdMap())
67+
return Lrc::new(Default::default())
6868
}
6969

7070
// Check to see if this crate is a "special runtime crate". These
@@ -299,7 +299,7 @@ fn upstream_monomorphizations_provider<'a, 'tcx>(
299299

300300
let cnums = tcx.all_crate_nums(LOCAL_CRATE);
301301

302-
let mut instances: DefIdMap<FxHashMap<_, _>> = DefIdMap();
302+
let mut instances: DefIdMap<FxHashMap<_, _>> = Default::default();
303303

304304
let cnum_stable_ids: IndexVec<CrateNum, Fingerprint> = {
305305
let mut cnum_stable_ids = IndexVec::from_elem_n(Fingerprint::ZERO,

‎src/librustc_data_structures/fx.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
pub use rustc_hash::FxHashMap;
12-
pub use rustc_hash::FxHashSet;
13-
pub use rustc_hash::FxHasher;
11+
pub use rustc_hash::{FxHasher, FxHashMap, FxHashSet};

‎src/librustc_lint/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDebugImplementations {
603603
};
604604

605605
if self.impling_types.is_none() {
606-
let mut impls = NodeSet();
606+
let mut impls = NodeSet::default();
607607
cx.tcx.for_each_impl(debug, |d| {
608608
if let Some(ty_def) = cx.tcx.type_of(d).ty_adt_def() {
609609
if let Some(node_id) = cx.tcx.hir.as_local_node_id(ty_def.did) {

‎src/librustc_metadata/cstore_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ pub fn provide<'tcx>(providers: &mut Providers<'tcx>) {
316316
use std::collections::hash_map::Entry;
317317

318318
assert_eq!(cnum, LOCAL_CRATE);
319-
let mut visible_parent_map: DefIdMap<DefId> = DefIdMap();
319+
let mut visible_parent_map: DefIdMap<DefId> = Default::default();
320320

321321
// Issue 46112: We want the map to prefer the shortest
322322
// paths when reporting the path to an item. Therefore we

‎src/librustc_mir/build/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
829829
1,
830830
),
831831
upvar_decls,
832-
var_indices: NodeMap(),
832+
var_indices: Default::default(),
833833
unit_temp: None,
834834
cached_resume_block: None,
835835
cached_return_block: None,

‎src/librustc_mir/monomorphize/collector.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ pub fn collect_crate_mono_items<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
314314

315315
time(tcx.sess, "collecting mono items", || {
316316
par_iter(roots).for_each(|root| {
317-
let mut recursion_depths = DefIdMap();
317+
let mut recursion_depths = DefIdMap::default();
318318
collect_items_rec(tcx,
319319
root,
320320
visited,

‎src/librustc_mir/transform/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fn mir_keys<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, krate: CrateNum)
7272
-> Lrc<DefIdSet> {
7373
assert_eq!(krate, LOCAL_CRATE);
7474

75-
let mut set = DefIdSet();
75+
let mut set = DefIdSet::default();
7676

7777
// All body-owners have MIR associated with them.
7878
set.extend(tcx.body_owners());

‎src/librustc_passes/rvalue_promotion.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ fn rvalue_promotable_map<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
8484
tables: &ty::TypeckTables::empty(None),
8585
in_fn: false,
8686
in_static: false,
87-
mut_rvalue_borrows: NodeSet(),
87+
mut_rvalue_borrows: Default::default(),
8888
param_env: ty::ParamEnv::empty(),
8989
identity_substs: Substs::empty(),
90-
result: ItemLocalSet(),
90+
result: ItemLocalSet::default(),
9191
};
9292

9393
// `def_id` should be a `Body` owner

‎src/librustc_privacy/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1761,7 +1761,7 @@ fn privacy_access_levels<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
17611761
tcx,
17621762
access_levels: &visitor.access_levels,
17631763
in_variant: false,
1764-
old_error_set: NodeSet(),
1764+
old_error_set: Default::default(),
17651765
};
17661766
intravisit::walk_crate(&mut visitor, krate);
17671767

‎src/librustc_resolve/check_unused.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ pub fn check_crate(resolver: &mut Resolver, krate: &ast::Crate) {
162162

163163
let mut visitor = UnusedImportCheckVisitor {
164164
resolver,
165-
unused_imports: NodeMap(),
165+
unused_imports: Default::default(),
166166
base_id: ast::DUMMY_NODE_ID,
167167
item_span: DUMMY_SP,
168168
};

‎src/librustc_resolve/lib.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1862,22 +1862,22 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
18621862

18631863
primitive_type_table: PrimitiveTypeTable::new(),
18641864

1865-
def_map: NodeMap(),
1866-
import_map: NodeMap(),
1867-
freevars: NodeMap(),
1868-
freevars_seen: NodeMap(),
1865+
def_map: Default::default(),
1866+
import_map: Default::default(),
1867+
freevars: Default::default(),
1868+
freevars_seen: Default::default(),
18691869
export_map: FxHashMap::default(),
1870-
trait_map: NodeMap(),
1870+
trait_map: Default::default(),
18711871
module_map,
1872-
block_map: NodeMap(),
1872+
block_map: Default::default(),
18731873
extern_module_map: FxHashMap::default(),
18741874
binding_parent_modules: FxHashMap::default(),
18751875

18761876
make_glob_map: make_glob_map == MakeGlobMap::Yes,
1877-
glob_map: NodeMap(),
1877+
glob_map: Default::default(),
18781878

18791879
used_imports: FxHashSet::default(),
1880-
maybe_unused_trait_imports: NodeSet(),
1880+
maybe_unused_trait_imports: Default::default(),
18811881
maybe_unused_extern_crates: Vec::new(),
18821882

18831883
unused_labels: FxHashMap::default(),
@@ -1907,7 +1907,7 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
19071907
name_already_seen: FxHashMap::default(),
19081908
whitelisted_legacy_custom_derives: Vec::new(),
19091909
potentially_unused_imports: Vec::new(),
1910-
struct_constructors: DefIdMap(),
1910+
struct_constructors: Default::default(),
19111911
found_unresolved_macro: false,
19121912
unused_macros: FxHashSet::default(),
19131913
current_type_ascription: Vec::new(),

‎src/librustc_typeck/check/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -643,11 +643,11 @@ impl<'a, 'gcx, 'tcx> Inherited<'a, 'gcx, 'tcx> {
643643
},
644644
infcx,
645645
fulfillment_cx: RefCell::new(TraitEngine::new(tcx)),
646-
locals: RefCell::new(NodeMap()),
647-
deferred_call_resolutions: RefCell::new(DefIdMap()),
646+
locals: RefCell::new(Default::default()),
647+
deferred_call_resolutions: RefCell::new(Default::default()),
648648
deferred_cast_checks: RefCell::new(Vec::new()),
649649
deferred_generator_interiors: RefCell::new(Vec::new()),
650-
opaque_types: RefCell::new(DefIdMap()),
650+
opaque_types: RefCell::new(Default::default()),
651651
implicit_region_bound,
652652
body_id,
653653
}
@@ -1986,7 +1986,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
19861986
has_errors: Cell::new(false),
19871987
enclosing_breakables: RefCell::new(EnclosingBreakables {
19881988
stack: Vec::new(),
1989-
by_id: NodeMap(),
1989+
by_id: Default::default(),
19901990
}),
19911991
inh,
19921992
}

0 commit comments

Comments
 (0)