From 14aed81d9ac058824af62c37b892b50fdb769912 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Sat, 21 Jul 2018 22:43:31 +0300 Subject: Use the new Entry::or_default method where possible. --- src/libsyntax/ext/expand.rs | 4 ++-- src/libsyntax/ext/tt/macro_rules.rs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 90b46268045..ffa2730d686 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -327,7 +327,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { // Unresolved macros produce dummy outputs as a recovery measure. invocations.reverse(); let mut expanded_fragments = Vec::new(); - let mut derives = HashMap::new(); + let mut derives: HashMap> = HashMap::new(); let mut undetermined_invocations = Vec::new(); let (mut progress, mut force) = (false, !self.monotonic); loop { @@ -388,7 +388,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { .map_attrs(|mut attrs| { attrs.retain(|a| a.path != "derive"); attrs }); let item_with_markers = add_derived_markers(&mut self.cx, item.span(), &traits, item.clone()); - let derives = derives.entry(invoc.expansion_data.mark).or_insert_with(Vec::new); + let derives = derives.entry(invoc.expansion_data.mark).or_default(); for path in &traits { let mark = Mark::fresh(self.cx.current_expansion.mark); diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index f51d079a6c0..770561fe326 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -88,8 +88,7 @@ impl TTMacroExpander for MacroRulesMacroExpander { fn trace_macros_note(cx: &mut ExtCtxt, sp: Span, message: String) { let sp = sp.macro_backtrace().last().map(|trace| trace.call_site).unwrap_or(sp); - let values: &mut Vec = cx.expansions.entry(sp).or_insert_with(Vec::new); - values.push(message); + cx.expansions.entry(sp).or_default().push(message); } /// Given `lhses` and `rhses`, this is the new macro we create -- cgit 1.4.1-3-g733a5