bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix some rebasing fallout.

Browse source
This commit is contained in:
Michael Woerister 2018-03-13 11:52:26 +01:00
parent 213ef111cf
commit a1a986cfae
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/middle/exported_symbols.rs
View file

@ -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 {

1
src/librustc_trans/back/symbol_export.rs
View file

@ -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<