Skip to content

Commit a61019b

Browse files
petrochenkovpetrochenkov
committed
hir: Remove fn opt_hir_id and fn opt_span 
1 parent 363b098 commit a61019b

File tree

44 files changed

+267
-326
lines changed

Some content is hidden

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

44 files changed

+267
-326
lines changed

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+57-64
Original file line numberDiff line numberDiff line change
@@ -401,66 +401,60 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
401401
}
402402
let typeck = self.infcx.tcx.typeck(self.mir_def_id());
403403
let hir_id = hir.parent_id(expr.hir_id);
404-
if let Some(parent) = self.infcx.tcx.opt_hir_node(hir_id) {
405-
let (def_id, args, offset) = if let hir::Node::Expr(parent_expr) = parent
406-
&& let hir::ExprKind::MethodCall(_, _, args, _) = parent_expr.kind
407-
&& let Some(def_id) = typeck.type_dependent_def_id(parent_expr.hir_id)
408-
{
409-
(def_id.as_local(), args, 1)
410-
} else if let hir::Node::Expr(parent_expr) = parent
411-
&& let hir::ExprKind::Call(call, args) = parent_expr.kind
412-
&& let ty::FnDef(def_id, _) = typeck.node_type(call.hir_id).kind()
413-
{
414-
(def_id.as_local(), args, 0)
415-
} else {
416-
(None, &[][..], 0)
404+
let parent = self.infcx.tcx.hir_node(hir_id);
405+
let (def_id, args, offset) = if let hir::Node::Expr(parent_expr) = parent
406+
&& let hir::ExprKind::MethodCall(_, _, args, _) = parent_expr.kind
407+
&& let Some(def_id) = typeck.type_dependent_def_id(parent_expr.hir_id)
408+
{
409+
(def_id.as_local(), args, 1)
410+
} else if let hir::Node::Expr(parent_expr) = parent
411+
&& let hir::ExprKind::Call(call, args) = parent_expr.kind
412+
&& let ty::FnDef(def_id, _) = typeck.node_type(call.hir_id).kind()
413+
{
414+
(def_id.as_local(), args, 0)
415+
} else {
416+
(None, &[][..], 0)
417+
};
418+
if let Some(def_id) = def_id
419+
&& let node =
420+
self.infcx.tcx.hir_node(self.infcx.tcx.local_def_id_to_hir_id(def_id))
421+
&& let Some(fn_sig) = node.fn_sig()
422+
&& let Some(ident) = node.ident()
423+
&& let Some(pos) = args.iter().position(|arg| arg.hir_id == expr.hir_id)
424+
&& let Some(arg) = fn_sig.decl.inputs.get(pos + offset)
425+
{
426+
let mut span: MultiSpan = arg.span.into();
427+
span.push_span_label(
428+
arg.span,
429+
"this parameter takes ownership of the value".to_string(),
430+
);
431+
let descr = match node.fn_kind() {
432+
Some(hir::intravisit::FnKind::ItemFn(..)) | None => "function",
433+
Some(hir::intravisit::FnKind::Method(..)) => "method",
434+
Some(hir::intravisit::FnKind::Closure) => "closure",
417435
};
418-
if let Some(def_id) = def_id
419-
&& let Some(node) = self
420-
.infcx
421-
.tcx
422-
.opt_hir_node(self.infcx.tcx.local_def_id_to_hir_id(def_id))
423-
&& let Some(fn_sig) = node.fn_sig()
424-
&& let Some(ident) = node.ident()
425-
&& let Some(pos) = args.iter().position(|arg| arg.hir_id == expr.hir_id)
426-
&& let Some(arg) = fn_sig.decl.inputs.get(pos + offset)
427-
{
428-
let mut span: MultiSpan = arg.span.into();
429-
span.push_span_label(
430-
arg.span,
431-
"this parameter takes ownership of the value".to_string(),
432-
);
433-
let descr = match node.fn_kind() {
434-
Some(hir::intravisit::FnKind::ItemFn(..)) | None => "function",
435-
Some(hir::intravisit::FnKind::Method(..)) => "method",
436-
Some(hir::intravisit::FnKind::Closure) => "closure",
437-
};
438-
span.push_span_label(ident.span, format!("in this {descr}"));
439-
err.span_note(
440-
span,
441-
format!(
442-
"consider changing this parameter type in {descr} `{ident}` to \
436+
span.push_span_label(ident.span, format!("in this {descr}"));
437+
err.span_note(
438+
span,
439+
format!(
440+
"consider changing this parameter type in {descr} `{ident}` to \
443441
borrow instead if owning the value isn't necessary",
444-
),
445-
);
446-
}
447-
let place = &self.move_data.move_paths[mpi].place;
448-
let ty = place.ty(self.body, self.infcx.tcx).ty;
449-
if let hir::Node::Expr(parent_expr) = parent
450-
&& let hir::ExprKind::Call(call_expr, _) = parent_expr.kind
451-
&& let hir::ExprKind::Path(hir::QPath::LangItem(
452-
LangItem::IntoIterIntoIter,
453-
_,
454-
)) = call_expr.kind
455-
{
456-
// Do not suggest `.clone()` in a `for` loop, we already suggest borrowing.
457-
} else if let UseSpans::FnSelfUse { kind: CallKind::Normal { .. }, .. } =
458-
move_spans
459-
{
460-
// We already suggest cloning for these cases in `explain_captures`.
461-
} else {
462-
self.suggest_cloning(err, ty, expr, move_span);
463-
}
442+
),
443+
);
444+
}
445+
let place = &self.move_data.move_paths[mpi].place;
446+
let ty = place.ty(self.body, self.infcx.tcx).ty;
447+
if let hir::Node::Expr(parent_expr) = parent
448+
&& let hir::ExprKind::Call(call_expr, _) = parent_expr.kind
449+
&& let hir::ExprKind::Path(hir::QPath::LangItem(LangItem::IntoIterIntoIter, _)) =
450+
call_expr.kind
451+
{
452+
// Do not suggest `.clone()` in a `for` loop, we already suggest borrowing.
453+
} else if let UseSpans::FnSelfUse { kind: CallKind::Normal { .. }, .. } = move_spans
454+
{
455+
// We already suggest cloning for these cases in `explain_captures`.
456+
} else {
457+
self.suggest_cloning(err, ty, expr, move_span);
464458
}
465459
}
466460
if let Some(pat) = finder.pat {
@@ -1762,7 +1756,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
17621756
fn_decl: hir::FnDecl { inputs, .. },
17631757
..
17641758
}) = e.kind
1765-
&& let Some(hir::Node::Expr(body)) = self.tcx.opt_hir_node(body.hir_id)
1759+
&& let hir::Node::Expr(body) = self.tcx.hir_node(body.hir_id)
17661760
{
17671761
self.suggest_arg = "this: &Self".to_string();
17681762
if inputs.len() > 0 {
@@ -1828,11 +1822,11 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
18281822
}
18291823
}
18301824

1831-
if let Some(hir::Node::ImplItem(hir::ImplItem {
1825+
if let hir::Node::ImplItem(hir::ImplItem {
18321826
kind: hir::ImplItemKind::Fn(_fn_sig, body_id),
18331827
..
1834-
})) = self.infcx.tcx.opt_hir_node(self.mir_hir_id())
1835-
&& let Some(hir::Node::Expr(expr)) = self.infcx.tcx.opt_hir_node(body_id.hir_id)
1828+
}) = self.infcx.tcx.hir_node(self.mir_hir_id())
1829+
&& let hir::Node::Expr(expr) = self.infcx.tcx.hir_node(body_id.hir_id)
18361830
{
18371831
let mut finder = ExpressionFinder {
18381832
capture_span: *capture_kind_span,
@@ -2400,8 +2394,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
24002394
let proper_span = proper_span.source_callsite();
24012395
if let Some(scope) = self.body.source_scopes.get(source_info.scope)
24022396
&& let ClearCrossCrate::Set(scope_data) = &scope.local_data
2403-
&& let Some(node) = self.infcx.tcx.opt_hir_node(scope_data.lint_root)
2404-
&& let Some(id) = node.body_id()
2397+
&& let Some(id) = self.infcx.tcx.hir_node(scope_data.lint_root).body_id()
24052398
&& let hir::ExprKind::Block(block, _) = self.infcx.tcx.hir().body(id).value.kind
24062399
{
24072400
for stmt in block.stmts {

‎compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
8787
if let hir::ExprKind::Path(hir::QPath::Resolved(None, p)) = expr.kind
8888
&& let [hir::PathSegment { ident, args: None, .. }] = p.segments
8989
&& let hir::def::Res::Local(hir_id) = p.res
90-
&& let Some(hir::Node::Pat(pat)) = tcx.opt_hir_node(hir_id)
90+
&& let hir::Node::Pat(pat) = tcx.hir_node(hir_id)
9191
{
9292
err.span_label(pat.span, format!("binding `{ident}` declared here"));
9393
}

‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
396396

397397
let upvar_hir_id = captured_place.get_root_variable();
398398

399-
if let Some(Node::Pat(pat)) = self.infcx.tcx.opt_hir_node(upvar_hir_id)
399+
if let Node::Pat(pat) = self.infcx.tcx.hir_node(upvar_hir_id)
400400
&& let hir::PatKind::Binding(hir::BindingAnnotation::NONE, _, upvar_ident, _) =
401401
pat.kind
402402
{
@@ -688,15 +688,15 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
688688
break;
689689
}
690690
f_in_trait_opt.and_then(|f_in_trait| {
691-
match self.infcx.tcx.opt_hir_node(f_in_trait) {
692-
Some(Node::TraitItem(hir::TraitItem {
691+
match self.infcx.tcx.hir_node(f_in_trait) {
692+
Node::TraitItem(hir::TraitItem {
693693
kind:
694694
hir::TraitItemKind::Fn(
695695
hir::FnSig { decl: hir::FnDecl { inputs, .. }, .. },
696696
_,
697697
),
698698
..
699-
})) => {
699+
}) => {
700700
let hir::Ty { span, .. } = inputs[local.index() - 1];
701701
Some(span)
702702
}
@@ -759,10 +759,10 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
759759
//
760760
// `let &b = a;` -> `let &(mut b) = a;`
761761
if let Some(hir_id) = hir_id
762-
&& let Some(hir::Node::Local(hir::Local {
762+
&& let hir::Node::Local(hir::Local {
763763
pat: hir::Pat { kind: hir::PatKind::Ref(_, _), .. },
764764
..
765-
})) = self.infcx.tcx.opt_hir_node(hir_id)
765+
}) = self.infcx.tcx.hir_node(hir_id)
766766
&& let Ok(name) =
767767
self.infcx.tcx.sess.source_map().span_to_snippet(local_decl.source_info.span)
768768
{
@@ -1206,7 +1206,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
12061206
};
12071207

12081208
if let Some(hir_id) = hir_id
1209-
&& let Some(hir::Node::Local(local)) = self.infcx.tcx.opt_hir_node(hir_id)
1209+
&& let hir::Node::Local(local) = self.infcx.tcx.hir_node(hir_id)
12101210
{
12111211
let tables = self.infcx.tcx.typeck(def_id.as_local().unwrap());
12121212
if let Some(clone_trait) = self.infcx.tcx.lang_items().clone_trait()

‎compiler/rustc_hir/src/intravisit.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ impl<'a> FnKind<'a> {
108108

109109
/// An abstract representation of the HIR `rustc_middle::hir::map::Map`.
110110
pub trait Map<'hir> {
111-
/// Retrieves the `Node` corresponding to `id`, returning `None` if cannot be found.
112-
fn find(&self, hir_id: HirId) -> Option<Node<'hir>>;
111+
/// Retrieves the `Node` corresponding to `id`.
112+
fn hir_node(&self, hir_id: HirId) -> Node<'hir>;
113113
fn body(&self, id: BodyId) -> &'hir Body<'hir>;
114114
fn item(&self, id: ItemId) -> &'hir Item<'hir>;
115115
fn trait_item(&self, id: TraitItemId) -> &'hir TraitItem<'hir>;
@@ -119,7 +119,7 @@ pub trait Map<'hir> {
119119

120120
// Used when no map is actually available, forcing manual implementation of nested visitors.
121121
impl<'hir> Map<'hir> for ! {
122-
fn find(&self, _: HirId) -> Option<Node<'hir>> {
122+
fn hir_node(&self, _: HirId) -> Node<'hir> {
123123
*self;
124124
}
125125
fn body(&self, _: BodyId) -> &'hir Body<'hir> {

‎compiler/rustc_hir_analysis/src/check/entry.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ fn check_main_fn_ty(tcx: TyCtxt<'_>, main_def_id: DefId) {
4343
return None;
4444
}
4545
let hir_id = tcx.local_def_id_to_hir_id(def_id.expect_local());
46-
match tcx.opt_hir_node(hir_id) {
47-
Some(Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _), .. })) => {
46+
match tcx.hir_node(hir_id) {
47+
Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _), .. }) => {
4848
generics.params.is_empty().not().then_some(generics.span)
4949
}
5050
_ => {
@@ -58,8 +58,8 @@ fn check_main_fn_ty(tcx: TyCtxt<'_>, main_def_id: DefId) {
5858
return None;
5959
}
6060
let hir_id = tcx.local_def_id_to_hir_id(def_id.expect_local());
61-
match tcx.opt_hir_node(hir_id) {
62-
Some(Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _), .. })) => {
61+
match tcx.hir_node(hir_id) {
62+
Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _), .. }) => {
6363
Some(generics.where_clause_span)
6464
}
6565
_ => {
@@ -80,8 +80,8 @@ fn check_main_fn_ty(tcx: TyCtxt<'_>, main_def_id: DefId) {
8080
return None;
8181
}
8282
let hir_id = tcx.local_def_id_to_hir_id(def_id.expect_local());
83-
match tcx.opt_hir_node(hir_id) {
84-
Some(Node::Item(hir::Item { kind: hir::ItemKind::Fn(fn_sig, _, _), .. })) => {
83+
match tcx.hir_node(hir_id) {
84+
Node::Item(hir::Item { kind: hir::ItemKind::Fn(fn_sig, _, _), .. }) => {
8585
Some(fn_sig.decl.output.span())
8686
}
8787
_ => {
@@ -202,7 +202,7 @@ fn check_start_fn_ty(tcx: TyCtxt<'_>, start_def_id: DefId) {
202202
let start_t = tcx.type_of(start_def_id).instantiate_identity();
203203
match start_t.kind() {
204204
ty::FnDef(..) => {
205-
if let Some(Node::Item(it)) = tcx.opt_hir_node(start_id) {
205+
if let Node::Item(it) = tcx.hir_node(start_id) {
206206
if let hir::ItemKind::Fn(sig, generics, _) = &it.kind {
207207
let mut error = false;
208208
if !generics.params.is_empty() {

‎compiler/rustc_hir_analysis/src/structured_errors/wrong_number_of_generic_args.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,7 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> {
771771
);
772772

773773
if let Some(parent_node) = self.tcx.hir().opt_parent_id(self.path_segment.hir_id)
774-
&& let Some(parent_node) = self.tcx.opt_hir_node(parent_node)
775-
&& let hir::Node::Expr(expr) = parent_node
774+
&& let hir::Node::Expr(expr) = self.tcx.hir_node(parent_node)
776775
{
777776
match &expr.kind {
778777
hir::ExprKind::Path(qpath) => self

‎compiler/rustc_hir_pretty/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use std::cell::Cell;
2323
use std::vec;
2424

2525
pub fn id_to_string(map: &dyn rustc_hir::intravisit::Map<'_>, hir_id: hir::HirId) -> String {
26-
to_string(&map, |s| s.print_node(map.find(hir_id).unwrap()))
26+
to_string(&map, |s| s.print_node(map.hir_node(hir_id)))
2727
}
2828

2929
pub enum AnnNode<'a> {

‎compiler/rustc_hir_typeck/src/coercion.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1715,8 +1715,8 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
17151715
let ret_msg = "return a value for the case when the loop has zero elements to iterate on";
17161716
let ret_ty_msg =
17171717
"otherwise consider changing the return type to account for that possibility";
1718-
if let Some(node) = tcx.opt_hir_node(item.into())
1719-
&& let Some(body_id) = node.body_id()
1718+
let node = tcx.hir_node(item.into());
1719+
if let Some(body_id) = node.body_id()
17201720
&& let Some(sig) = node.fn_sig()
17211721
&& let hir::ExprKind::Block(block, _) = hir.body(body_id).value.kind
17221722
&& !ty.is_never()

0 commit comments

Comments
 (0)