diff options
| author | jumbatm <30644300+jumbatm@users.noreply.github.com> | 2021-01-28 08:03:36 +1000 |
|---|---|---|
| committer | jumbatm <30644300+jumbatm@users.noreply.github.com> | 2021-01-28 08:03:36 +1000 |
| commit | a1a78304658d8caadb6e2f145be3eca659b49c17 (patch) | |
| tree | 96bf047325f9fad7d3e511cafeabb958ce935ce3 | |
| parent | 613ef740f3f37702728c6324f948d0abd1e9c82b (diff) | |
| download | rust-a1a78304658d8caadb6e2f145be3eca659b49c17.tar.gz rust-a1a78304658d8caadb6e2f145be3eca659b49c17.zip | |
Use symbol interning to avoid string alloc.
| -rw-r--r-- | compiler/rustc_lint/src/builtin.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs index b37660e4a90..d0e44550ee6 100644 --- a/compiler/rustc_lint/src/builtin.rs +++ b/compiler/rustc_lint/src/builtin.rs @@ -2607,7 +2607,7 @@ pub struct ClashingExternDeclarations { /// the symbol should be reported as a clashing declaration. // FIXME: Technically, we could just store a &'tcx str here without issue; however, the // `impl_lint_pass` macro doesn't currently support lints parametric over a lifetime. - seen_decls: FxHashMap<String, HirId>, + seen_decls: FxHashMap<Symbol, HirId>, } /// Differentiate between whether the name for an extern decl came from the link_name attribute or @@ -2641,14 +2641,14 @@ impl ClashingExternDeclarations { let local_did = tcx.hir().local_def_id(fi.hir_id); let did = local_did.to_def_id(); let instance = Instance::new(did, ty::List::identity_for_item(tcx, did)); - let name = tcx.symbol_name(instance).name; - if let Some(&hir_id) = self.seen_decls.get(name) { + let name = Symbol::intern(tcx.symbol_name(instance).name); + if let Some(&hir_id) = self.seen_decls.get(&name) { // Avoid updating the map with the new entry when we do find a collision. We want to // make sure we're always pointing to the first definition as the previous declaration. // This lets us avoid emitting "knock-on" diagnostics. Some(hir_id) } else { - self.seen_decls.insert(name.to_owned(), hid) + self.seen_decls.insert(name, hid) } } |
