Skip to content

Commit 62ac10f

Browse files
CentrilCentril
committed
simplify reexports in rustc::hir
1 parent 7785834 commit 62ac10f

File tree

23 files changed

+72
-78
lines changed

23 files changed

+72
-78
lines changed

‎src/librustc/hir.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,11 @@
33
//! [rustc guide]: https://rust-lang.github.io/rustc-guide/hir.html
44
55
pub mod check_attr;
6-
pub use rustc_hir::def;
76
pub mod exports;
8-
pub use rustc_hir::def_id;
9-
pub use rustc_hir::hir_id::*;
107
pub mod intravisit;
11-
pub use rustc_hir::itemlikevisit;
128
pub mod map;
13-
pub use rustc_hir::pat_util;
14-
pub use rustc_hir::print;
159
pub mod upvars;
1610

17-
pub use rustc_hir::BlockCheckMode::*;
18-
pub use rustc_hir::FunctionRetTy::*;
19-
pub use rustc_hir::PrimTy::*;
20-
pub use rustc_hir::UnOp::*;
21-
pub use rustc_hir::UnsafeSource::*;
2211
pub use rustc_hir::*;
2312

2413
use crate::ty::query::Providers;

‎src/librustc/hir/intravisit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ pub fn walk_where_predicate<'v, V: Visitor<'v>>(
867867
}
868868

869869
pub fn walk_fn_ret_ty<'v, V: Visitor<'v>>(visitor: &mut V, ret_ty: &'v FunctionRetTy<'v>) {
870-
if let Return(ref output_ty) = *ret_ty {
870+
if let FunctionRetTy::Return(ref output_ty) = *ret_ty {
871871
visitor.visit_ty(output_ty)
872872
}
873873
}

‎src/librustc_ast_lowering/expr.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
207207

208208
fn lower_unop(&mut self, u: UnOp) -> hir::UnOp {
209209
match u {
210-
UnOp::Deref => hir::UnDeref,
211-
UnOp::Not => hir::UnNot,
212-
UnOp::Neg => hir::UnNeg,
210+
UnOp::Deref => hir::UnOp::UnDeref,
211+
UnOp::Not => hir::UnOp::UnNot,
212+
UnOp::Neg => hir::UnOp::UnNeg,
213213
}
214214
}
215215

@@ -1374,7 +1374,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
13741374
stmts: &[],
13751375
expr: Some(expr),
13761376
hir_id,
1377-
rules: hir::UnsafeBlock(hir::CompilerGenerated),
1377+
rules: hir::BlockCheckMode::UnsafeBlock(hir::UnsafeSource::CompilerGenerated),
13781378
span,
13791379
targeted_by_break: false,
13801380
}),

‎src/librustc_ast_lowering/lib.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2144,12 +2144,14 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
21442144
} else {
21452145
match decl.output {
21462146
FunctionRetTy::Ty(ref ty) => match in_band_ty_params {
2147-
Some((def_id, _)) if impl_trait_return_allow => {
2148-
hir::Return(self.lower_ty(ty, ImplTraitContext::OpaqueTy(Some(def_id))))
2149-
}
2150-
_ => hir::Return(self.lower_ty(ty, ImplTraitContext::disallowed())),
2147+
Some((def_id, _)) if impl_trait_return_allow => hir::FunctionRetTy::Return(
2148+
self.lower_ty(ty, ImplTraitContext::OpaqueTy(Some(def_id))),
2149+
),
2150+
_ => hir::FunctionRetTy::Return(
2151+
self.lower_ty(ty, ImplTraitContext::disallowed()),
2152+
),
21512153
},
2152-
FunctionRetTy::Default(span) => hir::DefaultReturn(span),
2154+
FunctionRetTy::Default(span) => hir::FunctionRetTy::DefaultReturn(span),
21532155
}
21542156
};
21552157

@@ -2940,8 +2942,10 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
29402942

29412943
fn lower_block_check_mode(&mut self, b: &BlockCheckMode) -> hir::BlockCheckMode {
29422944
match *b {
2943-
BlockCheckMode::Default => hir::DefaultBlock,
2944-
BlockCheckMode::Unsafe(u) => hir::UnsafeBlock(self.lower_unsafe_source(u)),
2945+
BlockCheckMode::Default => hir::BlockCheckMode::DefaultBlock,
2946+
BlockCheckMode::Unsafe(u) => {
2947+
hir::BlockCheckMode::UnsafeBlock(self.lower_unsafe_source(u))
2948+
}
29452949
}
29462950
}
29472951

@@ -2956,8 +2960,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
29562960

29572961
fn lower_unsafe_source(&mut self, u: UnsafeSource) -> hir::UnsafeSource {
29582962
match u {
2959-
CompilerGenerated => hir::CompilerGenerated,
2960-
UserProvided => hir::UserProvided,
2963+
CompilerGenerated => hir::UnsafeSource::CompilerGenerated,
2964+
UserProvided => hir::UnsafeSource::UserProvided,
29612965
}
29622966
}
29632967

@@ -3004,7 +3008,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
30043008
stmts,
30053009
expr,
30063010
hir_id: self.next_id(),
3007-
rules: hir::DefaultBlock,
3011+
rules: hir::BlockCheckMode::DefaultBlock,
30083012
span,
30093013
targeted_by_break: false,
30103014
};

‎src/librustc_lint/types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ fn lint_literal<'a, 'tcx>(
376376
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeLimits {
377377
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, e: &'tcx hir::Expr<'tcx>) {
378378
match e.kind {
379-
hir::ExprKind::Unary(hir::UnNeg, ref expr) => {
379+
hir::ExprKind::Unary(hir::UnOp::UnNeg, ref expr) => {
380380
// propagate negation, if the negation itself isn't negated
381381
if self.negated_expr_id != e.hir_id {
382382
self.negated_expr_id = expr.hir_id;
@@ -969,7 +969,7 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
969969
self.check_type_for_ffi_and_report_errors(input_hir.span, input_ty, false);
970970
}
971971

972-
if let hir::Return(ref ret_hir) = decl.output {
972+
if let hir::FunctionRetTy::Return(ref ret_hir) = decl.output {
973973
let ret_ty = sig.output();
974974
if !ret_ty.is_unit() {
975975
self.check_type_for_ffi_and_report_errors(ret_hir.span, ret_ty, false);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> {
814814
}
815815
}
816816
hir::ExprKind::Path(ref qpath) => *self.lower_path(qpath, expr.hir_id, expr.span).kind,
817-
hir::ExprKind::Unary(hir::UnNeg, ref expr) => {
817+
hir::ExprKind::Unary(hir::UnOp::UnNeg, ref expr) => {
818818
let ty = self.tables.expr_ty(expr);
819819
let lit = match expr.kind {
820820
hir::ExprKind::Lit(ref lit) => lit,

‎src/librustc_mir/transform/check_unsafety.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ impl<'a, 'tcx> hir::intravisit::Visitor<'tcx> for UnusedUnsafeVisitor<'a> {
482482
fn visit_block(&mut self, block: &'tcx hir::Block<'tcx>) {
483483
hir::intravisit::walk_block(self, block);
484484

485-
if let hir::UnsafeBlock(hir::UserProvided) = block.rules {
485+
if let hir::BlockCheckMode::UnsafeBlock(hir::UnsafeSource::UserProvided) = block.rules {
486486
self.unsafe_blocks.push((block.hir_id, self.used_unsafe.contains(&block.hir_id)));
487487
}
488488
}

‎src/librustc_passes/region.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ fn resolve_local<'tcx>(
651651

652652
match expr.kind {
653653
hir::ExprKind::AddrOf(_, _, ref subexpr)
654-
| hir::ExprKind::Unary(hir::UnDeref, ref subexpr)
654+
| hir::ExprKind::Unary(hir::UnOp::UnDeref, ref subexpr)
655655
| hir::ExprKind::Field(ref subexpr, _)
656656
| hir::ExprKind::Index(ref subexpr, _) => {
657657
expr = &subexpr;

‎src/librustc_resolve/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use rustc::hir::def::{self, CtorKind, CtorOf, DefKind, NonMacroAttrKind, Partial
2626
use rustc::hir::def_id::{CrateNum, DefId, DefIdMap, CRATE_DEF_INDEX, LOCAL_CRATE};
2727
use rustc::hir::exports::ExportMap;
2828
use rustc::hir::map::Definitions;
29-
use rustc::hir::{Bool, Char, Float, Int, PrimTy, Str, Uint};
29+
use rustc::hir::PrimTy::{self, Bool, Char, Float, Int, Str, Uint};
3030
use rustc::hir::{GlobMap, TraitMap};
3131
use rustc::lint;
3232
use rustc::middle::cstore::{CrateStore, MetadataLoaderDyn};

‎src/librustc_resolve/lifetimes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,8 +846,8 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
846846

847847
fn visit_fn_decl(&mut self, fd: &'tcx hir::FnDecl<'tcx>) {
848848
let output = match fd.output {
849-
hir::DefaultReturn(_) => None,
850-
hir::Return(ref ty) => Some(&**ty),
849+
hir::FunctionRetTy::DefaultReturn(_) => None,
850+
hir::FunctionRetTy::Return(ref ty) => Some(&**ty),
851851
};
852852
self.visit_fn_like_elision(&fd.inputs, output);
853853
}

0 commit comments

Comments
 (0)