From ebfd8673a791661d9cb526d9994f2f6bbfa49348 Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Sun, 5 Jan 2020 02:37:57 +0100
Subject: Remove rustc_hir reexports in rustc::hir.

---
 src/librustdoc/html/format.rs       | 4 ++--
 src/librustdoc/html/render.rs       | 5 +++--
 src/librustdoc/html/render/cache.rs | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/librustdoc/html')

diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index f84fef2761e..2580bbf982b 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -9,9 +9,9 @@ use std::borrow::Cow;
 use std::cell::Cell;
 use std::fmt;
 
-use rustc::hir;
-use rustc::hir::def_id::DefId;
 use rustc_data_structures::fx::FxHashSet;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
 use rustc_target::spec::abi::Abi;
 
 use crate::clean::{self, PrimitiveType};
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index c315cefc1b8..7958c5ca2b6 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -43,13 +43,14 @@ use std::str;
 use std::sync::Arc;
 
 use errors;
-use rustc::hir::def_id::DefId;
-use rustc::hir::{self, Mutability};
 use rustc::middle::privacy::AccessLevels;
 use rustc::middle::stability;
 use rustc_data_structures::flock;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_feature::UnstableFeatures;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_hir::Mutability;
 use rustc_span::edition::Edition;
 use rustc_span::hygiene::MacroKind;
 use rustc_span::source_map::FileName;
diff --git a/src/librustdoc/html/render/cache.rs b/src/librustdoc/html/render/cache.rs
index 6de56ec5127..22507443b08 100644
--- a/src/librustdoc/html/render/cache.rs
+++ b/src/librustdoc/html/render/cache.rs
@@ -1,8 +1,8 @@
 use crate::clean::{self, AttributesExt, GetDefId};
 use crate::fold::DocFolder;
-use rustc::hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX};
 use rustc::middle::privacy::AccessLevels;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX};
 use rustc_span::source_map::FileName;
 use rustc_span::symbol::sym;
 use std::collections::BTreeMap;
-- 
cgit 1.4.1-3-g733a5