diff options
| author | Michael Woerister <michaelwoerister@posteo> | 2018-03-13 11:52:26 +0100 |
|---|---|---|
| committer | Michael Woerister <michaelwoerister@posteo> | 2018-04-06 12:14:08 +0200 |
| commit | a1a986cfae567b1b21dfb8359b585e5aeebf84b8 (patch) | |
| tree | 666df0048f38535f84ae276c016121c99f955d70 | |
| parent | 213ef111cfdb4bca63b5c37f440b2c028c6ca676 (diff) | |
| download | rust-a1a986cfae567b1b21dfb8359b585e5aeebf84b8.tar.gz rust-a1a986cfae567b1b21dfb8359b585e5aeebf84b8.zip | |
Fix some rebasing fallout.
| -rw-r--r-- | src/librustc/middle/exported_symbols.rs | 4 | ||||
| -rw-r--r-- | src/librustc_trans/back/symbol_export.rs | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc/middle/exported_symbols.rs b/src/librustc/middle/exported_symbols.rs index 2652eb0091c..01783eb0ff6 100644 --- 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 index 0f88e9cd7b7..90dec83c1d4 100644 --- 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< |
