Skip to content

Commit 0997388

Browse files
CentrilCentril
committed
normalize rustc::hir::intravisit imports
1 parent 922f8b7 commit 0997388

File tree

47 files changed

+50
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+50
-55
lines changed

‎src/librustc/hir/check_attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//! conflicts between multiple such attributes attached to the same
55
//! item.
66
7-
use crate::hir::intravisit::{self, NestedVisitorMap, Visitor};
87
use crate::hir::map::Map;
98
use crate::lint::builtin::UNUSED_ATTRIBUTES;
109
use crate::ty::query::Providers;
@@ -14,6 +13,7 @@ use errors::struct_span_err;
1413
use rustc_error_codes::*;
1514
use rustc_hir as hir;
1615
use rustc_hir::def_id::DefId;
16+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1717
use rustc_hir::DUMMY_HIR_ID;
1818
use rustc_hir::{self, HirId, Item, ItemKind, TraitItem, TraitItemKind};
1919
use rustc_span::symbol::sym;

‎src/librustc/hir/map/blocks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
//! nested within a uniquely determined `FnLike`), and users can ask
1212
//! for the `Code` associated with a particular NodeId.
1313
14-
use crate::hir::intravisit::FnKind;
1514
use crate::hir::map::Map;
1615
use rustc_hir as hir;
16+
use rustc_hir::intravisit::FnKind;
1717
use rustc_hir::{Expr, FnDecl, Node};
1818
use rustc_span::Span;
1919
use syntax::ast::{Attribute, Ident};

‎src/librustc/hir/map/collector.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use crate::dep_graph::{DepGraph, DepKind, DepNode, DepNodeIndex};
2-
use crate::hir::intravisit::{self, NestedVisitorMap, Visitor};
32
use crate::hir::map::definitions::{self, DefPathHash};
43
use crate::hir::map::{Entry, HirEntryMap, Map};
54
use crate::ich::StableHashingContext;
@@ -11,6 +10,7 @@ use rustc_data_structures::svh::Svh;
1110
use rustc_hir as hir;
1211
use rustc_hir::def_id::CRATE_DEF_INDEX;
1312
use rustc_hir::def_id::{CrateNum, DefIndex, LOCAL_CRATE};
13+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1414
use rustc_hir::*;
1515
use rustc_index::vec::IndexVec;
1616
use rustc_session::{CrateDisambiguator, Session};

‎src/librustc/hir/map/hir_id_validator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::hir::intravisit;
21
use crate::hir::map::Map;
32
use rustc_data_structures::fx::FxHashSet;
43
use rustc_data_structures::sync::{par_iter, Lock, ParallelIterator};
54
use rustc_hir as hir;
65
use rustc_hir::def_id::{DefId, DefIndex, CRATE_DEF_INDEX};
6+
use rustc_hir::intravisit;
77
use rustc_hir::itemlikevisit::ItemLikeVisitor;
88
use rustc_hir::{HirId, ItemLocalId};
99

‎src/librustc/hir/map/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ pub use self::definitions::{
44
};
55

66
use crate::dep_graph::{DepGraph, DepKind, DepNode, DepNodeIndex};
7-
use crate::hir::intravisit;
87
use crate::middle::cstore::CrateStoreDyn;
98
use crate::ty::query::Providers;
109
use rustc_data_structures::fx::FxHashMap;
1110
use rustc_data_structures::svh::Svh;
1211
use rustc_hir::def::{DefKind, Res};
1312
use rustc_hir::def_id::{DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX};
13+
use rustc_hir::intravisit;
1414
use rustc_hir::itemlikevisit::ItemLikeVisitor;
1515
use rustc_hir::print::Nested;
1616
use rustc_hir::*;

‎src/librustc/hir/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ pub mod exports;
77
pub mod map;
88
pub mod upvars;
99

10-
pub use rustc_hir::intravisit;
11-
1210
use crate::ty::query::Providers;
1311

1412
pub fn provide(providers: &mut Providers<'_>) {

‎src/librustc/hir/upvars.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
//! Upvar (closure capture) collection from cross-body HIR uses of `Res::Local`s.
22
3-
use crate::hir::intravisit::{self, NestedVisitorMap, Visitor};
43
use crate::hir::map::Map;
54
use crate::ty::query::Providers;
65
use crate::ty::TyCtxt;
76
use rustc_data_structures::fx::{FxHashSet, FxIndexMap};
87
use rustc_hir as hir;
98
use rustc_hir::def::Res;
9+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1010
use rustc_hir::{self, HirId};
1111
use rustc_span::Span;
1212

‎src/librustc/infer/error_reporting/need_type_info.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use crate::hir::intravisit::{self, NestedVisitorMap, Visitor};
21
use crate::hir::map::Map;
32
use crate::infer::type_variable::TypeVariableOriginKind;
43
use crate::infer::InferCtxt;
@@ -7,6 +6,7 @@ use crate::ty::{self, DefIdTree, Infer, Ty, TyVar};
76
use errors::{struct_span_err, Applicability, DiagnosticBuilder};
87
use rustc_hir as hir;
98
use rustc_hir::def::{DefKind, Namespace};
9+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1010
use rustc_hir::{Body, Expr, ExprKind, FunctionRetTy, HirId, Local, Pat};
1111
use rustc_span::source_map::DesugaringKind;
1212
use rustc_span::symbol::kw;

‎src/librustc/infer/error_reporting/nice_region_error/find_anon_type.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::hir::intravisit::{self, NestedVisitorMap, Visitor};
21
use crate::hir::map::Map;
32
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
43
use crate::middle::resolve_lifetime as rl;
54
use crate::ty::{self, Region, TyCtxt};
65
use rustc_hir as hir;
6+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
77
use rustc_hir::Node;
88

99
impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {

‎src/librustc/lint/mod.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
pub use self::Level::*;
2222
pub use self::LintSource::*;
2323

24-
use rustc_data_structures::sync;
25-
2624
use crate::lint::builtin::BuiltinLintDiagnostics;
2725
use crate::ty::TyCtxt;
2826
use errors::{DiagnosticBuilder, DiagnosticId};
27+
use rustc_data_structures::sync;
2928
use rustc_hir as hir;
3029
use rustc_session::node_id::NodeMap;
3130
use rustc_session::{DiagnosticMessageId, Session};
@@ -109,13 +108,13 @@ macro_rules! late_lint_methods {
109108
fn check_where_predicate(a: &$hir hir::WherePredicate<$hir>);
110109
fn check_poly_trait_ref(a: &$hir hir::PolyTraitRef<$hir>, b: hir::TraitBoundModifier);
111110
fn check_fn(
112-
a: $crate::hir::intravisit::FnKind<$hir>,
111+
a: rustc_hir::intravisit::FnKind<$hir>,
113112
b: &$hir hir::FnDecl<$hir>,
114113
c: &$hir hir::Body<$hir>,
115114
d: Span,
116115
e: hir::HirId);
117116
fn check_fn_post(
118-
a: $crate::hir::intravisit::FnKind<$hir>,
117+
a: rustc_hir::intravisit::FnKind<$hir>,
119118
b: &$hir hir::FnDecl<$hir>,
120119
c: &$hir hir::Body<$hir>,
121120
d: Span,

‎src/librustc/middle/weak_lang_items.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
use crate::middle::lang_items;
44
use crate::session::config;
55

6-
use crate::hir::intravisit;
7-
use crate::hir::intravisit::{NestedVisitorMap, Visitor};
86
use crate::hir::map::Map;
97
use crate::ty::TyCtxt;
108
use errors::struct_span_err;
119
use rustc_data_structures::fx::FxHashSet;
1210
use rustc_hir as hir;
1311
use rustc_hir::def_id::DefId;
12+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1413
use rustc_span::symbol::{sym, Symbol};
1514
use rustc_span::Span;
1615
use rustc_target::spec::PanicStrategy;

‎src/librustc_ast_lowering/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
use rustc::arena::Arena;
3838
use rustc::dep_graph::DepGraph;
39-
use rustc::hir::intravisit;
4039
use rustc::hir::map::definitions::{DefKey, DefPathData, Definitions};
4140
use rustc::hir::map::Map;
4241
use rustc::lint;
@@ -52,6 +51,7 @@ use rustc_errors::{struct_span_err, Applicability};
5251
use rustc_hir as hir;
5352
use rustc_hir::def::{DefKind, Namespace, PartialRes, PerNS, Res};
5453
use rustc_hir::def_id::{DefId, DefIdMap, DefIndex, CRATE_DEF_INDEX};
54+
use rustc_hir::intravisit;
5555
use rustc_hir::{ConstArg, GenericArg, ParamName};
5656
use rustc_index::vec::IndexVec;
5757
use rustc_session::config::nightly_options;

‎src/librustc_incremental/assert_dep_graph.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
use graphviz as dot;
3737
use rustc::dep_graph::debug::{DepNodeFilter, EdgeFilter};
3838
use rustc::dep_graph::{DepGraphQuery, DepKind, DepNode};
39-
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
4039
use rustc::hir::map::Map;
4140
use rustc::ty::TyCtxt;
4241
use rustc_data_structures::fx::FxHashSet;
4342
use rustc_data_structures::graph::implementation::{Direction, NodeIndex, INCOMING, OUTGOING};
4443
use rustc_hir as hir;
4544
use rustc_hir::def_id::DefId;
45+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
4646
use rustc_span::symbol::sym;
4747
use rustc_span::Span;
4848
use syntax::ast;

‎src/librustc_incremental/persist/dirty_clean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
//! the required condition is not met.
1515
1616
use rustc::dep_graph::{label_strs, DepNode};
17-
use rustc::hir::intravisit;
1817
use rustc::hir::map::Map;
1918
use rustc::ty::TyCtxt;
2019
use rustc_data_structures::fingerprint::Fingerprint;
2120
use rustc_data_structures::fx::FxHashSet;
2221
use rustc_hir as hir;
2322
use rustc_hir::def_id::DefId;
23+
use rustc_hir::intravisit;
2424
use rustc_hir::itemlikevisit::ItemLikeVisitor;
2525
use rustc_hir::Node as HirNode;
2626
use rustc_hir::{ImplItemKind, ItemKind as HirItem, TraitItemKind};

‎src/librustc_lint/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ impl TypeAliasBounds {
10891089
// bound. Let's see if this type does that.
10901090

10911091
// We use a HIR visitor to walk the type.
1092-
use rustc::hir::intravisit::{self, Visitor};
1092+
use rustc_hir::intravisit::{self, Visitor};
10931093
struct WalkAssocTypes<'a, 'db> {
10941094
err: &'a mut DiagnosticBuilder<'db>,
10951095
}

‎src/librustc_lint/late.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
//! upon. As the ast is traversed, this keeps track of the current lint level
1515
//! for all lint attributes.
1616
17-
use rustc::hir::intravisit as hir_visit;
18-
use rustc::hir::intravisit::Visitor;
1917
use rustc::hir::map::Map;
2018
use rustc::lint::LateContext;
2119
use rustc::lint::LintPass;
@@ -24,6 +22,8 @@ use rustc::ty::{self, TyCtxt};
2422
use rustc_data_structures::sync::{join, par_iter, ParallelIterator};
2523
use rustc_hir as hir;
2624
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
25+
use rustc_hir::intravisit as hir_visit;
26+
use rustc_hir::intravisit::Visitor;
2727
use rustc_span::Span;
2828
use std::slice;
2929
use syntax::ast;

‎src/librustc_lint/levels.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use rustc::hir::intravisit;
21
use rustc::hir::map::Map;
32
use rustc::lint::{LintLevelMap, LintLevelSets, LintLevelsBuilder, LintStore};
43
use rustc::ty::query::Providers;
54
use rustc::ty::TyCtxt;
65
use rustc_hir as hir;
76
use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
7+
use rustc_hir::intravisit;
88
use syntax::ast;
99

1010
pub use rustc_session::lint::{FutureIncompatibleInfo, Level, Lint, LintId};

‎src/librustc_lint/nonstandard_style.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use lint::{EarlyContext, LateContext, LintArray, LintContext};
22
use lint::{EarlyLintPass, LateLintPass, LintPass};
3-
use rustc::hir::intravisit::FnKind;
43
use rustc::lint;
54
use rustc::ty;
65
use rustc_hir as hir;
76
use rustc_hir::def::{DefKind, Res};
7+
use rustc_hir::intravisit::FnKind;
88
use rustc_hir::{GenericParamKind, PatKind};
99
use rustc_span::symbol::sym;
1010
use rustc_span::{symbol::Ident, BytePos, Span};

‎src/librustc_metadata/rmeta/encoder.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ use syntax::ast;
3636
use syntax::attr;
3737
use syntax::expand::is_proc_macro_attr;
3838

39-
use rustc::hir::intravisit;
40-
use rustc::hir::intravisit::{NestedVisitorMap, Visitor};
4139
use rustc_hir as hir;
40+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
4241
use rustc_hir::itemlikevisit::ItemLikeVisitor;
4342

4443
struct EncodeContext<'tcx> {

‎src/librustc_mir/hair/pattern/check_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use super::_match::{expand_pattern, is_useful, MatchCheckCtxt, Matrix, PatStack}
44

55
use super::{PatCtxt, PatKind, PatternError};
66

7-
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
87
use rustc::hir::map::Map;
98
use rustc::lint;
109
use rustc::session::Session;
@@ -15,6 +14,7 @@ use rustc_errors::{error_code, struct_span_err, Applicability, DiagnosticBuilder
1514
use rustc_hir as hir;
1615
use rustc_hir::def::*;
1716
use rustc_hir::def_id::DefId;
17+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1818
use rustc_hir::{HirId, Pat};
1919
use rustc_span::symbol::sym;
2020
use rustc_span::{MultiSpan, Span};

‎src/librustc_mir/lints.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use rustc::hir::intravisit::FnKind;
21
use rustc::hir::map::blocks::FnLikeNode;
32
use rustc::lint::builtin::UNCONDITIONAL_RECURSION;
43
use rustc::mir::{self, Body, TerminatorKind};
54
use rustc::ty::subst::InternalSubsts;
65
use rustc::ty::{self, AssocItem, AssocItemContainer, Instance, TyCtxt};
76
use rustc_hir::def_id::DefId;
7+
use rustc_hir::intravisit::FnKind;
88
use rustc_index::bit_set::BitSet;
99

1010
pub fn check(tcx: TyCtxt<'tcx>, body: &Body<'tcx>, def_id: DefId) {

‎src/librustc_mir/transform/check_unsafety.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use rustc::hir::intravisit;
21
use rustc::hir::map::Map;
32
use rustc::lint::builtin::{SAFE_PACKED_BORROWS, UNUSED_UNSAFE};
43
use rustc::mir::visit::{MutatingUseContext, PlaceContext, Visitor};
@@ -10,6 +9,7 @@ use rustc_data_structures::fx::FxHashSet;
109
use rustc_errors::struct_span_err;
1110
use rustc_hir as hir;
1211
use rustc_hir::def_id::DefId;
12+
use rustc_hir::intravisit;
1313
use rustc_hir::Node;
1414
use rustc_span::symbol::{sym, Symbol};
1515

‎src/librustc_mir/transform/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use crate::{build, shim};
2-
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
32
use rustc::hir::map::Map;
43
use rustc::mir::{BodyAndCache, ConstQualifs, MirPhase, Promoted};
54
use rustc::ty::query::Providers;
65
use rustc::ty::steal::Steal;
76
use rustc::ty::{InstanceDef, TyCtxt, TypeFoldable};
87
use rustc_hir as hir;
98
use rustc_hir::def_id::{CrateNum, DefId, DefIdSet, LOCAL_CRATE};
9+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1010
use rustc_index::vec::IndexVec;
1111
use rustc_span::Span;
1212
use std::borrow::Cow;

‎src/librustc_passes/check_const.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
//! through, but errors for structured control flow in a `const` should be emitted here.
99
1010
use errors::struct_span_err;
11-
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
1211
use rustc::hir::map::Map;
1312
use rustc::session::config::nightly_options;
1413
use rustc::ty::query::Providers;
1514
use rustc::ty::TyCtxt;
1615
use rustc_error_codes::*;
1716
use rustc_hir as hir;
1817
use rustc_hir::def_id::DefId;
18+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1919
use rustc_span::{sym, Span, Symbol};
2020
use syntax::ast::Mutability;
2121
use syntax::feature_gate::feature_err;

‎src/librustc_passes/dead.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// closely. The idea is that all reachable symbols are live, codes called
33
// from live codes are live, and everything else is dead.
44

5-
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
65
use rustc::hir::map::Map;
76
use rustc::lint;
87
use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags;
@@ -12,6 +11,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1211
use rustc_hir as hir;
1312
use rustc_hir::def::{CtorOf, DefKind, Res};
1413
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
14+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1515
use rustc_hir::itemlikevisit::ItemLikeVisitor;
1616
use rustc_hir::{Node, PatKind, TyKind};
1717

‎src/librustc_passes/hir_stats.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// pieces of AST and HIR. The resulting numbers are good approximations but not
33
// completely accurate (some things might be counted twice, others missed).
44

5-
use rustc::hir::intravisit as hir_visit;
65
use rustc::hir::map::Map;
76
use rustc::util::common::to_readable_str;
87
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
98
use rustc_hir as hir;
9+
use rustc_hir::intravisit as hir_visit;
1010
use rustc_hir::HirId;
1111
use rustc_span::Span;
1212
use syntax::ast::{self, AttrId, NodeId};

‎src/librustc_passes/intrinsicck.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use errors::struct_span_err;
2-
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
32
use rustc::hir::map::Map;
43
use rustc::ty::layout::{LayoutError, Pointer, SizeSkeleton, VariantIdx};
54
use rustc::ty::query::Providers;
65
use rustc::ty::{self, Ty, TyCtxt};
76
use rustc_hir as hir;
87
use rustc_hir::def::{DefKind, Res};
98
use rustc_hir::def_id::DefId;
9+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1010
use rustc_index::vec::Idx;
1111
use rustc_span::{sym, Span};
1212
use rustc_target::spec::abi::Abi::RustIntrinsic;

‎src/librustc_passes/lib_features.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
// (unlike lang features), which means we need to collect them instead.
66

77
use errors::struct_span_err;
8-
use rustc::hir::intravisit::{self, NestedVisitorMap, Visitor};
98
use rustc::hir::map::Map;
109
use rustc::middle::lib_features::LibFeatures;
1110
use rustc::ty::query::Providers;
1211
use rustc::ty::TyCtxt;
1312
use rustc_hir::def_id::LOCAL_CRATE;
13+
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
1414
use rustc_span::symbol::Symbol;
1515
use rustc_span::{sym, Span};
1616
use syntax::ast::{Attribute, MetaItem, MetaItemKind};

0 commit comments

Comments
 (0)