Fix some rebasing fallout.

rust-lang · Apr 6, 2018 · a1a986c · a1a986c
1 parent 213ef11
commit a1a986c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/librustc/middle/exported_symbols.rs b/src/librustc/middle/exported_symbols.rs
@@ -112,9 +112,9 @@ pub fn metadata_symbol_name(tcx: ty::TyCtxt) -> String {
             tcx.crate_disambiguator(LOCAL_CRATE).to_fingerprint().to_hex())
 }
 
-impl<'gcx> HashStable<StableHashingContext<'gcx>> for ExportedSymbol<'gcx> {
+impl<'a, 'gcx> HashStable<StableHashingContext<'a>> for ExportedSymbol<'gcx> {
     fn hash_stable<W: StableHasherResult>(&self,
-                                          hcx: &mut StableHashingContext<'gcx>,
+                                          hcx: &mut StableHashingContext<'a>,
                                           hasher: &mut StableHasher<W>) {
         mem::discriminant(self).hash_stable(hcx, hasher);
         match *self {

diff --git a/src/librustc_trans/back/symbol_export.rs b/src/librustc_trans/back/symbol_export.rs
@@ -24,7 +24,6 @@ use rustc::ty::subst::Substs;
 use rustc::util::nodemap::{FxHashMap, DefIdMap};
 use rustc_allocator::ALLOCATOR_METHODS;
 use rustc_data_structures::indexed_vec::IndexVec;
-use syntax::attr;
 use std::collections::hash_map::Entry::*;
 
 pub type ExportedSymbols = FxHashMap<