user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #67886 - Centril:rustc_hir_canon_imports, r=nagisa

Browse source 
Nix `rustc_hir` reexports in rustc::hir

r? @Zoxc cc @Mark-Simulacrum
This commit is contained in:
bors 2020-01-06 12:55:40 +00:00
commit ebbb2bf37a
345 changed files with 949 additions and 911 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustdoc/html/format.rs
View file

@ -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};

5
src/librustdoc/html/render.rs
View file

@ -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;

2
src/librustdoc/html/render/cache.rs
View file

@ -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;