diff options
| author | bors <bors@rust-lang.org> | 2016-08-26 19:05:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-26 19:05:11 -0700 |
| commit | b7e2157dbab228e491919094f012af3ff8ce530c (patch) | |
| tree | 5106e185858cfdec22cebc3bc22d35548b3e904b /src/librustc_metadata/decoder.rs | |
| parent | 1987131063f08afc54d57cdba56c2acddcff191d (diff) | |
| parent | c043a27e4232993d4366962f854d4d3812c66fff (diff) | |
| download | rust-b7e2157dbab228e491919094f012af3ff8ce530c.tar.gz rust-b7e2157dbab228e491919094f012af3ff8ce530c.zip | |
Auto merge of #35542 - scottcarr:visitor_refactor, r=nikomatsakis
[MIR] track Location in MirVisitor, combine Location All the users of MirVisitor::visit_statement implement their own statement index tracking. This PR move the tracking into MirVisitor itself. Also, there were 2 separate implementations of Location that were identical. This PR eliminates one of them.
Diffstat (limited to 'src/librustc_metadata/decoder.rs')
| -rw-r--r-- | src/librustc_metadata/decoder.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs index b0335258b40..ccbc4de82fb 100644 --- a/src/librustc_metadata/decoder.rs +++ b/src/librustc_metadata/decoder.rs @@ -42,6 +42,7 @@ use rustc_const_math::ConstInt; use rustc::mir; use rustc::mir::visit::MutVisitor; +use rustc::mir::repr::Location; use std::cell::Cell; use std::io; @@ -846,7 +847,7 @@ pub fn maybe_get_item_mir<'a, 'tcx>(cdata: Cmd, impl<'v, 'cdata, 'codemap> mir::visit::MutVisitor<'v> for MirDefIdAndSpanTranslator<'cdata, 'codemap> { - fn visit_def_id(&mut self, def_id: &mut DefId) { + fn visit_def_id(&mut self, def_id: &mut DefId, _: Location) { *def_id = translate_def_id(self.crate_metadata, *def_id); } |