about summary refs log tree commit diff
path: root/src/librustdoc/html/render.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-06 12:55:40 +0000
committerbors <bors@rust-lang.org>2020-01-06 12:55:40 +0000
commitebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093 (patch)
treeb2f80431c23470654d440694c3b5196bd40f0376 /src/librustdoc/html/render.rs
parenta80e63f3fa77792e848e3b248acf4c0acda2e310 (diff)
parent01563682c69867984525c255a3232eba9859cff5 (diff)
downloadrust-ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093.tar.gz
rust-ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093.zip
Auto merge of #67886 - Centril:rustc_hir_canon_imports, r=nagisa
Nix `rustc_hir` reexports in rustc::hir

r? @Zoxc cc @Mark-Simulacrum
Diffstat (limited to 'src/librustdoc/html/render.rs')
-rw-r--r--src/librustdoc/html/render.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 85661621fba..025257b801f 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;