diff options
| author | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2019-01-30 17:50:46 +0100 |
|---|---|---|
| committer | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2019-01-30 17:50:46 +0100 |
| commit | a7a5cb620feab14defb633af4ebf8d0671c22441 (patch) | |
| tree | 41492cbd93706c4bd67bf41f9813ecaa4dac22c5 | |
| parent | 5aa713e1c39b0e84ae9c96f99514f4981d3cea30 (diff) | |
| download | rust-a7a5cb620feab14defb633af4ebf8d0671c22441.tar.gz rust-a7a5cb620feab14defb633af4ebf8d0671c22441.zip | |
Prefer macro over manual implementation
| -rw-r--r-- | src/librustc_mir/interpret/snapshot.rs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/librustc_mir/interpret/snapshot.rs b/src/librustc_mir/interpret/snapshot.rs index 0b5dc944692..c9fe673c847 100644 --- a/src/librustc_mir/interpret/snapshot.rs +++ b/src/librustc_mir/interpret/snapshot.rs @@ -7,7 +7,7 @@ use std::hash::{Hash, Hasher}; -use rustc::ich::{StableHashingContextProvider, StableHashingContext}; +use rustc::ich::StableHashingContextProvider; use rustc::mir; use rustc::mir::interpret::{ AllocId, Pointer, Scalar, @@ -19,7 +19,7 @@ use rustc::ty::{self, TyCtxt}; use rustc::ty::layout::Align; use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::indexed_vec::IndexVec; -use rustc_data_structures::stable_hasher::{HashStable, StableHasher, StableHasherResult}; +use rustc_data_structures::stable_hasher::{HashStable, StableHasher}; use syntax::ast::Mutability; use syntax::source_map::Span; @@ -366,16 +366,10 @@ impl<'a, 'tcx, Ctx> Snapshot<'a, Ctx> for &'a LocalValue<'tcx> } } - -impl<'a, 'gcx> HashStable<StableHashingContext<'a>> for LocalValue<'gcx> { - fn hash_stable<W: StableHasherResult>( - &self, - hcx: &mut StableHashingContext<'a>, - hasher: &mut StableHasher<W>, - ) { - self.state.hash_stable(hcx, hasher); - } -} +impl_stable_hash_for!(struct LocalValue<'tcx> { + state, + layout -> _, +}); impl<'a, 'b, 'mir, 'tcx: 'a+'mir> SnapshotContext<'b> for Memory<'a, 'mir, 'tcx, CompileTimeInterpreter<'a, 'mir, 'tcx>> |
