diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2020-03-25 06:45:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 06:45:36 +0100 |
| commit | d894f5eaf577422bb789564cc2029f833a7fcdf0 (patch) | |
| tree | 91454467d7709094167f345ce6179566c2e7fdae /src/librustc_resolve | |
| parent | cb17049b36c367070a35913861426249521596cd (diff) | |
| parent | 917289907d16e670a38c2f7eaffb46b500127694 (diff) | |
Rollup merge of #70373 - Centril:canon-imports, r=Mark-Simulacrum
normalize some imports & prefer direct ones r? @Mark-Simulacrum
Diffstat (limited to 'src/librustc_resolve')
| -rw-r--r-- | src/librustc_resolve/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index 5b112677cf7..ed304572a06 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -17,7 +17,6 @@ pub use rustc_hir::def::{Namespace, PerNS}; use Determinacy::*; use rustc::hir::exports::ExportMap; -use rustc::hir::map::{DefKey, Definitions}; use rustc::middle::cstore::{CrateStore, MetadataLoaderDyn}; use rustc::span_bug; use rustc::ty::query::Providers; @@ -38,6 +37,7 @@ use rustc_expand::base::SyntaxExtension; use rustc_hir::def::Namespace::*; use rustc_hir::def::{self, CtorOf, DefKind, NonMacroAttrKind, PartialRes}; use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, CRATE_DEF_INDEX}; +use rustc_hir::definitions::{DefKey, Definitions}; use rustc_hir::PrimTy::{self, Bool, Char, Float, Int, Str, Uint}; use rustc_hir::{GlobMap, TraitMap}; use rustc_metadata::creader::{CStore, CrateLoader}; |
