diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-02-09 00:15:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-09 00:15:55 +0100 |
| commit | 8cbee1c68e64ca6ccd82cb8735b7312f61d3e9db (patch) | |
| tree | 64436412f17e337e4a587203be51df4da28dc7b6 /src/librustc_metadata/decoder.rs | |
| parent | 379a048bbb1fe26a87610ac0d2c40f28a9243afe (diff) | |
| parent | 7267bc2d4a0ba006d63b58eb927362d620930c68 (diff) | |
Rollup merge of #58255 - taiki-e:librustc_metadata-2018, r=Centril
librustc_metadata => 2018 Transitions `librustc_metadata` to Rust 2018; cc #58099 r? @Centril
Diffstat (limited to 'src/librustc_metadata/decoder.rs')
| -rw-r--r-- | src/librustc_metadata/decoder.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs index ad6296e1a3b..6d7907b096a 100644 --- a/src/librustc_metadata/decoder.rs +++ b/src/librustc_metadata/decoder.rs @@ -1,7 +1,7 @@ // Decoding metadata from a single crate's metadata -use cstore::{self, CrateMetadata, MetadataBlob, NativeLibrary, ForeignModule}; -use schema::*; +use crate::cstore::{self, CrateMetadata, MetadataBlob, NativeLibrary, ForeignModule}; +use crate::schema::*; use rustc_data_structures::sync::{Lrc, ReadGuard}; use rustc::hir::map::{DefKey, DefPath, DefPathData, DefPathHash, Definitions}; @@ -34,6 +34,7 @@ use syntax::symbol::InternedString; use syntax::ext::base::{MacroKind, SyntaxExtension}; use syntax::ext::hygiene::Mark; use syntax_pos::{self, Span, BytePos, Pos, DUMMY_SP, NO_EXPANSION}; +use log::debug; pub struct DecodeContext<'a, 'tcx: 'a> { opaque: opaque::Decoder<'a>, @@ -545,7 +546,7 @@ impl<'a, 'tcx> CrateMetadata { fn get_variant(&self, tcx: TyCtxt<'a, 'tcx, 'tcx>, - item: &Entry, + item: &Entry<'_>, index: DefIndex, adt_kind: ty::AdtKind) -> ty::VariantDef |