Skip to content

Commit 0795348

Browse files
ManishearthManishearth
authored
Rollup merge of rust-lang#74582 - Lezzz:rename-hair, r=nikomatsakis
Rename HAIR to THIR (Typed HIR). r? @nikomatsakis Originally suggested by @eddyb
2 parents 9fdc807 + b9ac3f3 commit 0795348

File tree

36 files changed

+128
-121
lines changed

36 files changed

+128
-121
lines changed

‎src/librustc_middle/ty/context.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ pub struct TypeckResults<'tcx> {
352352
pat_binding_modes: ItemLocalMap<BindingMode>,
353353

354354
/// Stores the types which were implicitly dereferenced in pattern binding modes
355-
/// for later usage in HAIR lowering. For example,
355+
/// for later usage in THIR lowering. For example,
356356
///
357357
/// ```
358358
/// match &&Some(5i32) {

‎src/librustc_mir_build/build/block.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::build::matches::ArmHasGuard;
22
use crate::build::ForGuard::OutsideGuard;
33
use crate::build::{BlockAnd, BlockAndExtension, BlockFrame, Builder};
4-
use crate::hair::*;
4+
use crate::thir::*;
55
use rustc_hir as hir;
66
use rustc_middle::mir::*;
77
use rustc_session::lint::builtin::UNSAFE_OP_IN_UNSAFE_FN;
@@ -176,7 +176,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
176176
let tail_result_is_ignored =
177177
destination_ty.is_unit() || this.block_context.currently_ignores_tail_results();
178178
let span = match expr {
179-
ExprRef::Hair(expr) => expr.span,
179+
ExprRef::Thir(expr) => expr.span,
180180
ExprRef::Mirror(ref expr) => expr.span,
181181
};
182182
this.block_context.push(BlockFrame::TailExpr { tail_result_is_ignored, span });
@@ -235,11 +235,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
235235
.push_unsafe_count
236236
.checked_sub(1)
237237
.unwrap_or_else(|| span_bug!(span, "unsafe count underflow"));
238-
if self.push_unsafe_count == 0 {
239-
Some(self.unpushed_unsafe)
240-
} else {
241-
None
242-
}
238+
if self.push_unsafe_count == 0 { Some(self.unpushed_unsafe) } else { None }
243239
}
244240
};
245241

‎src/librustc_mir_build/build/expr/as_constant.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! See docs in build/expr/mod.rs
22
33
use crate::build::Builder;
4-
use crate::hair::*;
4+
use crate::thir::*;
55
use rustc_middle::mir::*;
66
use rustc_middle::ty::CanonicalUserTypeAnnotation;
77

‎src/librustc_mir_build/build/expr/as_operand.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::build::expr::category::Category;
44
use crate::build::{BlockAnd, BlockAndExtension, Builder};
5-
use crate::hair::*;
5+
use crate::thir::*;
66
use rustc_middle::middle::region;
77
use rustc_middle::mir::*;
88

‎src/librustc_mir_build/build/expr/as_place.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use crate::build::expr::category::Category;
44
use crate::build::ForGuard::{OutsideGuard, RefWithinGuard};
55
use crate::build::{BlockAnd, BlockAndExtension, Builder};
6-
use crate::hair::*;
6+
use crate::thir::*;
77
use rustc_middle::middle::region;
88
use rustc_middle::mir::AssertKind::BoundsCheck;
99
use rustc_middle::mir::*;

‎src/librustc_mir_build/build/expr/as_rvalue.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc_index::vec::Idx;
44

55
use crate::build::expr::category::{Category, RvalueFunc};
66
use crate::build::{BlockAnd, BlockAndExtension, Builder};
7-
use crate::hair::*;
7+
use crate::thir::*;
88
use rustc_middle::middle::region;
99
use rustc_middle::mir::AssertKind;
1010
use rustc_middle::mir::*;

‎src/librustc_mir_build/build/expr/as_temp.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::build::scope::DropKind;
44
use crate::build::{BlockAnd, BlockAndExtension, Builder};
5-
use crate::hair::*;
5+
use crate::thir::*;
66
use rustc_data_structures::stack::ensure_sufficient_stack;
77
use rustc_hir as hir;
88
use rustc_middle::middle::region;
@@ -67,12 +67,14 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
6767
ExprKind::StaticRef { def_id, .. } => {
6868
assert!(!this.hir.tcx().is_thread_local_static(def_id));
6969
local_decl.internal = true;
70-
local_decl.local_info = Some(box LocalInfo::StaticRef { def_id, is_thread_local: false });
70+
local_decl.local_info =
71+
Some(box LocalInfo::StaticRef { def_id, is_thread_local: false });
7172
}
7273
ExprKind::ThreadLocalRef(def_id) => {
7374
assert!(this.hir.tcx().is_thread_local_static(def_id));
7475
local_decl.internal = true;
75-
local_decl.local_info = Some(box LocalInfo::StaticRef { def_id, is_thread_local: true });
76+
local_decl.local_info =
77+
Some(box LocalInfo::StaticRef { def_id, is_thread_local: true });
7678
}
7779
_ => {}
7880
}

‎src/librustc_mir_build/build/expr/category.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::hair::*;
1+
use crate::thir::*;
22

33
#[derive(Debug, PartialEq)]
44
crate enum Category {

‎src/librustc_mir_build/build/expr/into.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::build::expr::category::{Category, RvalueFunc};
44
use crate::build::{BlockAnd, BlockAndExtension, BlockFrame, Builder};
5-
use crate::hair::*;
5+
use crate::thir::*;
66
use rustc_ast::ast::InlineAsmOptions;
77
use rustc_data_structures::fx::FxHashMap;
88
use rustc_data_structures::stack::ensure_sufficient_stack;
@@ -320,23 +320,23 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
320320
block.unit()
321321
}
322322
ExprKind::InlineAsm { template, operands, options, line_spans } => {
323-
use crate::hair;
323+
use crate::thir;
324324
use rustc_middle::mir;
325325
let operands = operands
326326
.into_iter()
327327
.map(|op| match op {
328-
hair::InlineAsmOperand::In { reg, expr } => mir::InlineAsmOperand::In {
328+
thir::InlineAsmOperand::In { reg, expr } => mir::InlineAsmOperand::In {
329329
reg,
330330
value: unpack!(block = this.as_local_operand(block, expr)),
331331
},
332-
hair::InlineAsmOperand::Out { reg, late, expr } => {
332+
thir::InlineAsmOperand::Out { reg, late, expr } => {
333333
mir::InlineAsmOperand::Out {
334334
reg,
335335
late,
336336
place: expr.map(|expr| unpack!(block = this.as_place(block, expr))),
337337
}
338338
}
339-
hair::InlineAsmOperand::InOut { reg, late, expr } => {
339+
thir::InlineAsmOperand::InOut { reg, late, expr } => {
340340
let place = unpack!(block = this.as_place(block, expr));
341341
mir::InlineAsmOperand::InOut {
342342
reg,
@@ -346,7 +346,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
346346
out_place: Some(place),
347347
}
348348
}
349-
hair::InlineAsmOperand::SplitInOut { reg, late, in_expr, out_expr } => {
349+
thir::InlineAsmOperand::SplitInOut { reg, late, in_expr, out_expr } => {
350350
mir::InlineAsmOperand::InOut {
351351
reg,
352352
late,
@@ -356,13 +356,13 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
356356
}),
357357
}
358358
}
359-
hair::InlineAsmOperand::Const { expr } => mir::InlineAsmOperand::Const {
359+
thir::InlineAsmOperand::Const { expr } => mir::InlineAsmOperand::Const {
360360
value: unpack!(block = this.as_local_operand(block, expr)),
361361
},
362-
hair::InlineAsmOperand::SymFn { expr } => {
362+
thir::InlineAsmOperand::SymFn { expr } => {
363363
mir::InlineAsmOperand::SymFn { value: box this.as_constant(expr) }
364364
}
365-
hair::InlineAsmOperand::SymStatic { def_id } => {
365+
thir::InlineAsmOperand::SymStatic { def_id } => {
366366
mir::InlineAsmOperand::SymStatic { def_id }
367367
}
368368
})

‎src/librustc_mir_build/build/expr/stmt.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::build::scope::BreakableTarget;
22
use crate::build::{BlockAnd, BlockAndExtension, BlockFrame, Builder};
3-
use crate::hair::*;
3+
use crate::thir::*;
44
use rustc_middle::middle::region;
55
use rustc_middle::mir::*;
66

77
impl<'a, 'tcx> Builder<'a, 'tcx> {
8-
/// Builds a block of MIR statements to evaluate the HAIR `expr`.
8+
/// Builds a block of MIR statements to evaluate the THIR `expr`.
99
/// If the original expression was an AST statement,
1010
/// (e.g., `some().code(&here());`) then `opt_stmt_span` is the
1111
/// span of that statement (including its semicolon, if any).
@@ -150,8 +150,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
150150
break;
151151
}
152152
}
153-
this.block_context
154-
.push(BlockFrame::TailExpr { tail_result_is_ignored: true, span: expr.span });
153+
this.block_context.push(BlockFrame::TailExpr {
154+
tail_result_is_ignored: true,
155+
span: expr.span,
156+
});
155157
return Some(expr.span);
156158
}
157159
}

0 commit comments

Comments
 (0)