From 3b66f4e79244bdc3749177ca679a29cd878a315c Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Thu, 2 Jan 2020 03:39:11 +0100 Subject: [PATCH] split hir/mod.rs -> hir.rs & hir/hir.rs --- src/librustc/hir.rs | 30 +++++++++++++++++++++++++++++ src/librustc/hir/check_attr.rs | 3 ++- src/librustc/hir/{mod.rs => hir.rs} | 23 ++++------------------ src/librustc/hir/intravisit.rs | 2 +- src/librustc/hir/map/collector.rs | 2 +- src/librustc/hir/map/mod.rs | 5 +++-- 6 files changed, 41 insertions(+), 24 deletions(-) create mode 100644 src/librustc/hir.rs rename src/librustc/hir/{mod.rs => hir.rs} (99%) diff --git a/src/librustc/hir.rs b/src/librustc/hir.rs new file mode 100644 index 000000000000..149f6ca10c5e --- /dev/null +++ b/src/librustc/hir.rs @@ -0,0 +1,30 @@ +//! HIR datatypes. See the [rustc guide] for more info. +//! +//! [rustc guide]: https://rust-lang.github.io/rustc-guide/hir.html + +pub mod check_attr; +pub mod def; +pub use rustc_hir::def_id; +pub use rustc_hir::hir_id::*; +pub mod intravisit; +pub mod itemlikevisit; +pub mod map; +pub mod pat_util; +pub mod print; +pub mod upvars; + +mod hir; +pub use hir::BlockCheckMode::*; +pub use hir::FunctionRetTy::*; +pub use hir::PrimTy::*; +pub use hir::UnOp::*; +pub use hir::UnsafeSource::*; +pub use hir::*; + +use crate::ty::query::Providers; + +pub fn provide(providers: &mut Providers<'_>) { + check_attr::provide(providers); + map::provide(providers); + upvars::provide(providers); +} diff --git a/src/librustc/hir/check_attr.rs b/src/librustc/hir/check_attr.rs index a7d7dddf580d..08d4163add73 100644 --- a/src/librustc/hir/check_attr.rs +++ b/src/librustc/hir/check_attr.rs @@ -7,7 +7,7 @@ use crate::hir::def_id::DefId; use crate::hir::intravisit::{self, NestedVisitorMap, Visitor}; use crate::hir::DUMMY_HIR_ID; -use crate::hir::{self, Attribute, HirId, Item, ItemKind, TraitItem, TraitItemKind}; +use crate::hir::{self, HirId, Item, ItemKind, TraitItem, TraitItemKind}; use crate::lint::builtin::UNUSED_ATTRIBUTES; use crate::ty::query::Providers; use crate::ty::TyCtxt; @@ -15,6 +15,7 @@ use crate::ty::TyCtxt; use rustc_error_codes::*; use rustc_span::symbol::sym; use rustc_span::Span; +use syntax::ast::Attribute; use syntax::attr; use std::fmt::{self, Display}; diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/hir.rs similarity index 99% rename from src/librustc/hir/mod.rs rename to src/librustc/hir/hir.rs index f6085c5f8730..0c719c3db827 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/hir.rs @@ -9,12 +9,14 @@ pub use self::UnOp::*; pub use self::UnsafeSource::*; use crate::hir::def::{DefKind, Res}; -use crate::hir::def_id::{DefId, DefIndex}; -use crate::ty::query::Providers; +use crate::hir::def_id::DefId; +use crate::hir::itemlikevisit; +use crate::hir::print; use errors::FatalError; use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::sync::{par_for_each_in, Send, Sync}; +use rustc_hir::hir_id::*; use rustc_macros::HashStable; use rustc_session::node_id::NodeMap; use rustc_span::source_map::{SourceMap, Spanned}; @@ -31,17 +33,6 @@ pub use syntax::ast::{CaptureBy, Constness, Movability, Mutability, Unsafety}; use syntax::tokenstream::TokenStream; use syntax::util::parser::ExprPrecedence; -pub mod check_attr; -pub mod def; -pub use rustc_hir::def_id; -pub use rustc_hir::hir_id::*; -pub mod intravisit; -pub mod itemlikevisit; -pub mod map; -pub mod pat_util; -pub mod print; -pub mod upvars; - #[derive(Copy, Clone, RustcEncodable, RustcDecodable, HashStable)] pub struct Lifetime { pub hir_id: HirId, @@ -2581,12 +2572,6 @@ pub type TraitMap = NodeMap>; // imported. pub type GlobMap = NodeMap>; -pub fn provide(providers: &mut Providers<'_>) { - check_attr::provide(providers); - map::provide(providers); - upvars::provide(providers); -} - #[derive(Copy, Clone, Debug)] pub enum Node<'hir> { Param(&'hir Param<'hir>), diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs index 241febe0cf60..12fe1f703706 100644 --- a/src/librustc/hir/intravisit.rs +++ b/src/librustc/hir/intravisit.rs @@ -37,7 +37,7 @@ use crate::hir::map::Map; use crate::hir::*; use rustc_span::Span; -use syntax::ast::{Attribute, Ident, Name}; +use syntax::ast::{Attribute, Ident, Label, Name}; #[derive(Copy, Clone)] pub enum FnKind<'a> { diff --git a/src/librustc/hir/map/collector.rs b/src/librustc/hir/map/collector.rs index 21cafb4270f7..25083281ce9d 100644 --- a/src/librustc/hir/map/collector.rs +++ b/src/librustc/hir/map/collector.rs @@ -1,7 +1,7 @@ use super::*; use crate::dep_graph::{DepGraph, DepKind, DepNodeIndex}; use crate::hir; -use crate::hir::def_id::{CrateNum, LOCAL_CRATE}; +use crate::hir::def_id::{CrateNum, DefIndex, LOCAL_CRATE}; use crate::hir::intravisit::{NestedVisitorMap, Visitor}; use crate::hir::map::HirEntryMap; use crate::ich::Fingerprint; diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs index abaa9fa9ae62..92547bbe038d 100644 --- a/src/librustc/hir/map/mod.rs +++ b/src/librustc/hir/map/mod.rs @@ -4,10 +4,10 @@ pub use self::definitions::{ }; use crate::dep_graph::{DepGraph, DepKind, DepNode, DepNodeIndex}; -use crate::hir::def_id::{DefId, LocalDefId, CRATE_DEF_INDEX}; +use crate::hir::def::{DefKind, Res}; +use crate::hir::def_id::{DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX}; use crate::hir::itemlikevisit::ItemLikeVisitor; use crate::hir::print::Nested; -use crate::hir::DefKind; use crate::hir::*; use crate::middle::cstore::CrateStoreDyn; use crate::ty::query::Providers; @@ -18,6 +18,7 @@ use rustc_data_structures::svh::Svh; use rustc_index::vec::IndexVec; use rustc_span::hygiene::MacroKind; use rustc_span::source_map::Spanned; +use rustc_span::symbol::kw; use rustc_span::{Span, DUMMY_SP}; use rustc_target::spec::abi::Abi; use syntax::ast::{self, Name, NodeId};