Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 93d3633

Browse files
pnkfelixpnkfelix
committedOct 15, 2024
checkpoint compiler and rustdoc changes that build with some HIR adoption of contract form.
1 parent 59642ca commit 93d3633

File tree

36 files changed

+124
-98
lines changed

36 files changed

+124
-98
lines changed
 

‎compiler/rustc_ast_lowering/src/item.rs

+13-1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
206206
ItemKind::Fn(box Fn {
207207
sig: FnSig { decl, header, span: fn_sig_span },
208208
generics,
209+
contract,
209210
body,
210211
..
211212
}) => {
@@ -240,7 +241,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
240241
header: this.lower_fn_header(*header, hir::Safety::Safe),
241242
span: this.lower_span(*fn_sig_span),
242243
};
243-
hir::ItemKind::Fn(sig, generics, body_id)
244+
let contract_ids = this.lower_contract(contract);
245+
hir::ItemKind::Fn(sig, generics, Some(contract_ids), body_id)
244246
})
245247
}
246248
ItemKind::Mod(_, mod_kind) => match mod_kind {
@@ -457,6 +459,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
457459
hir::ItemKind::Fn(
458460
delegation_results.sig,
459461
delegation_results.generics,
462+
None,
460463
delegation_results.body_id,
461464
)
462465
}
@@ -1128,6 +1131,15 @@ impl<'hir> LoweringContext<'_, 'hir> {
11281131
})
11291132
}
11301133

1134+
fn lower_contract(&mut self, contract: &ast::FnContract) -> &'hir hir::FnContractIds {
1135+
let precond_expr = contract.requires.as_ref().map(|e| self.lower_expr(&e));
1136+
let postcond_expr = contract.ensures.as_ref().map(|e| self.lower_expr(&e));
1137+
let precond_hir_id: Option<hir::HirId> = precond_expr.map(|e| e.hir_id);
1138+
let postcond_hir_id: Option<hir::HirId> = postcond_expr.map(|e| e.hir_id);
1139+
1140+
self.arena.alloc(hir::FnContractIds { precond_hir_id, postcond_hir_id, })
1141+
}
1142+
11311143
/// Takes what may be the body of an `async fn` or a `gen fn` and wraps it in an `async {}` or
11321144
/// `gen {}` block as appropriate.
11331145
fn lower_maybe_coroutine_body(

‎compiler/rustc_hir/src/hir.rs

+16-10
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,12 @@ pub struct BodyId {
14411441
pub hir_id: HirId,
14421442
}
14431443

1444+
#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug, HashStable_Generic)]
1445+
pub struct FnContractIds {
1446+
pub precond_hir_id: Option<HirId>,
1447+
pub postcond_hir_id: Option<HirId>,
1448+
}
1449+
14441450
/// The body of a function, closure, or constant value. In the case of
14451451
/// a function, the body contains not only the function body itself
14461452
/// (which is an expression), but also the argument patterns, since
@@ -3325,8 +3331,8 @@ impl<'hir> Item<'hir> {
33253331
expect_const, (&'hir Ty<'hir>, &'hir Generics<'hir>, BodyId),
33263332
ItemKind::Const(ty, generics, body), (ty, generics, *body);
33273333

3328-
expect_fn, (&FnSig<'hir>, &'hir Generics<'hir>, BodyId),
3329-
ItemKind::Fn(sig, generics, body), (sig, generics, *body);
3334+
expect_fn, (&FnSig<'hir>, &'hir Generics<'hir>, Option<&'hir FnContractIds>, BodyId),
3335+
ItemKind::Fn(sig, generics, contract_ids, body), (sig, generics, *contract_ids, *body);
33303336

33313337
expect_macro, (&ast::MacroDef, MacroKind), ItemKind::Macro(def, mk), (def, *mk);
33323338

@@ -3441,7 +3447,7 @@ pub enum ItemKind<'hir> {
34413447
/// A `const` item.
34423448
Const(&'hir Ty<'hir>, &'hir Generics<'hir>, BodyId),
34433449
/// A function declaration.
3444-
Fn(FnSig<'hir>, &'hir Generics<'hir>, BodyId),
3450+
Fn(FnSig<'hir>, &'hir Generics<'hir>, Option<&'hir FnContractIds>, BodyId),
34453451
/// A MBE macro definition (`macro_rules!` or `macro`).
34463452
Macro(&'hir ast::MacroDef, MacroKind),
34473453
/// A module.
@@ -3492,7 +3498,7 @@ pub struct Impl<'hir> {
34923498
impl ItemKind<'_> {
34933499
pub fn generics(&self) -> Option<&Generics<'_>> {
34943500
Some(match *self {
3495-
ItemKind::Fn(_, ref generics, _)
3501+
ItemKind::Fn(_, ref generics, _, _)
34963502
| ItemKind::TyAlias(_, ref generics)
34973503
| ItemKind::Const(_, ref generics, _)
34983504
| ItemKind::Enum(_, ref generics)
@@ -3677,7 +3683,7 @@ impl<'hir> OwnerNode<'hir> {
36773683
match self {
36783684
OwnerNode::TraitItem(TraitItem { kind: TraitItemKind::Fn(fn_sig, _), .. })
36793685
| OwnerNode::ImplItem(ImplItem { kind: ImplItemKind::Fn(fn_sig, _), .. })
3680-
| OwnerNode::Item(Item { kind: ItemKind::Fn(fn_sig, _, _), .. })
3686+
| OwnerNode::Item(Item { kind: ItemKind::Fn(fn_sig, _, _, _), .. })
36813687
| OwnerNode::ForeignItem(ForeignItem {
36823688
kind: ForeignItemKind::Fn(fn_sig, _, _), ..
36833689
}) => Some(fn_sig),
@@ -3689,7 +3695,7 @@ impl<'hir> OwnerNode<'hir> {
36893695
match self {
36903696
OwnerNode::TraitItem(TraitItem { kind: TraitItemKind::Fn(fn_sig, _), .. })
36913697
| OwnerNode::ImplItem(ImplItem { kind: ImplItemKind::Fn(fn_sig, _), .. })
3692-
| OwnerNode::Item(Item { kind: ItemKind::Fn(fn_sig, _, _), .. })
3698+
| OwnerNode::Item(Item { kind: ItemKind::Fn(fn_sig, _, _, _), .. })
36933699
| OwnerNode::ForeignItem(ForeignItem {
36943700
kind: ForeignItemKind::Fn(fn_sig, _, _), ..
36953701
}) => Some(fn_sig.decl),
@@ -3703,7 +3709,7 @@ impl<'hir> OwnerNode<'hir> {
37033709
kind:
37043710
ItemKind::Static(_, _, body)
37053711
| ItemKind::Const(_, _, body)
3706-
| ItemKind::Fn(_, _, body),
3712+
| ItemKind::Fn(_, _, _, body),
37073713
..
37083714
})
37093715
| OwnerNode::TraitItem(TraitItem {
@@ -3882,7 +3888,7 @@ impl<'hir> Node<'hir> {
38823888
match self {
38833889
Node::TraitItem(TraitItem { kind: TraitItemKind::Fn(fn_sig, _), .. })
38843890
| Node::ImplItem(ImplItem { kind: ImplItemKind::Fn(fn_sig, _), .. })
3885-
| Node::Item(Item { kind: ItemKind::Fn(fn_sig, _, _), .. })
3891+
| Node::Item(Item { kind: ItemKind::Fn(fn_sig, _, _, _), .. })
38863892
| Node::ForeignItem(ForeignItem { kind: ForeignItemKind::Fn(fn_sig, _, _), .. }) => {
38873893
Some(fn_sig.decl)
38883894
}
@@ -3912,7 +3918,7 @@ impl<'hir> Node<'hir> {
39123918
match self {
39133919
Node::TraitItem(TraitItem { kind: TraitItemKind::Fn(fn_sig, _), .. })
39143920
| Node::ImplItem(ImplItem { kind: ImplItemKind::Fn(fn_sig, _), .. })
3915-
| Node::Item(Item { kind: ItemKind::Fn(fn_sig, _, _), .. })
3921+
| Node::Item(Item { kind: ItemKind::Fn(fn_sig, _, _, _), .. })
39163922
| Node::ForeignItem(ForeignItem { kind: ForeignItemKind::Fn(fn_sig, _, _), .. }) => {
39173923
Some(fn_sig)
39183924
}
@@ -4015,7 +4021,7 @@ impl<'hir> Node<'hir> {
40154021
pub fn fn_kind(self) -> Option<FnKind<'hir>> {
40164022
match self {
40174023
Node::Item(i) => match i.kind {
4018-
ItemKind::Fn(ref sig, ref generics, _) => {
4024+
ItemKind::Fn(ref sig, ref generics, _, _) => {
40194025
Some(FnKind::ItemFn(i.ident, generics, sig.header))
40204026
}
40214027
_ => None,

‎compiler/rustc_hir/src/intravisit.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,9 @@ pub trait Visitor<'v>: Sized {
313313
fn visit_id(&mut self, _hir_id: HirId) -> Self::Result {
314314
Self::Result::output()
315315
}
316+
fn visit_contract_ids(&mut self, _fn_contract_ids: &FnContractIds) -> Self::Result {
317+
Self::Result::output()
318+
}
316319
fn visit_name(&mut self, _name: Symbol) -> Self::Result {
317320
Self::Result::output()
318321
}
@@ -513,8 +516,11 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item<'v>) -> V::
513516
try_visit!(visitor.visit_generics(generics));
514517
try_visit!(visitor.visit_nested_body(body));
515518
}
516-
ItemKind::Fn(ref sig, ref generics, body_id) => {
519+
ItemKind::Fn(ref sig, ref generics, fn_contract_ids, body_id) => {
517520
try_visit!(visitor.visit_id(item.hir_id()));
521+
if let Some(fn_contract_ids) = fn_contract_ids {
522+
try_visit!(visitor.visit_contract_ids(fn_contract_ids));
523+
}
518524
try_visit!(visitor.visit_fn(
519525
FnKind::ItemFn(item.ident, generics, sig.header),
520526
sig.decl,

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn check_main_fn_ty(tcx: TyCtxt<'_>, main_def_id: DefId) {
4545
return None;
4646
}
4747
match tcx.hir_node_by_def_id(def_id.expect_local()) {
48-
Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _), .. }) => {
48+
Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _, _), .. }) => {
4949
generics.params.is_empty().not().then_some(generics.span)
5050
}
5151
_ => {
@@ -59,7 +59,7 @@ fn check_main_fn_ty(tcx: TyCtxt<'_>, main_def_id: DefId) {
5959
return None;
6060
}
6161
match tcx.hir_node_by_def_id(def_id.expect_local()) {
62-
Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _), .. }) => {
62+
Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _, _), .. }) => {
6363
Some(generics.where_clause_span)
6464
}
6565
_ => {
@@ -80,7 +80,7 @@ fn check_main_fn_ty(tcx: TyCtxt<'_>, main_def_id: DefId) {
8080
return None;
8181
}
8282
match tcx.hir_node_by_def_id(def_id.expect_local()) {
83-
Node::Item(hir::Item { kind: hir::ItemKind::Fn(fn_sig, _, _), .. }) => {
83+
Node::Item(hir::Item { kind: hir::ItemKind::Fn(fn_sig, _, _, _), .. }) => {
8484
Some(fn_sig.decl.output.span())
8585
}
8686
_ => {
@@ -202,7 +202,7 @@ fn check_start_fn_ty(tcx: TyCtxt<'_>, start_def_id: DefId) {
202202
match start_t.kind() {
203203
ty::FnDef(..) => {
204204
if let Node::Item(it) = tcx.hir_node(start_id) {
205-
if let hir::ItemKind::Fn(sig, generics, _) = &it.kind {
205+
if let hir::ItemKind::Fn(sig, generics, _, _) = &it.kind {
206206
let mut error = false;
207207
if !generics.params.is_empty() {
208208
tcx.dcx().emit_err(errors::StartFunctionParameters { span: generics.span });

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fn equate_intrinsic_type<'tcx>(
2828
sig: ty::PolyFnSig<'tcx>,
2929
) {
3030
let (generics, span) = match tcx.hir_node_by_def_id(def_id) {
31-
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _), .. })
31+
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, generics, _, _), .. })
3232
| hir::Node::ForeignItem(hir::ForeignItem {
3333
kind: hir::ForeignItemKind::Fn(_, _, generics),
3434
..

‎compiler/rustc_hir_analysis/src/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,7 @@ fn fn_sig(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::EarlyBinder<'_, ty::PolyFn
13151315
generics,
13161316
..
13171317
})
1318-
| Item(hir::Item { kind: ItemKind::Fn(sig, generics, _), .. }) => {
1318+
| Item(hir::Item { kind: ItemKind::Fn(sig, generics, _, _), .. }) => {
13191319
infer_return_ty_for_fn_sig(sig, generics, def_id, &icx)
13201320
}
13211321

‎compiler/rustc_hir_analysis/src/collect/generics_of.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use rustc_hir::def::DefKind;
88
use rustc_hir::def_id::LocalDefId;
99
use rustc_middle::ty::{self, TyCtxt};
1010
use rustc_session::lint;
11+
use rustc_span::symbol::{kw, Symbol};
1112
use rustc_span::Span;
12-
use rustc_span::symbol::{Symbol, kw};
1313
use tracing::{debug, instrument};
1414

1515
use crate::delegation::inherit_generics_for_delegation_item;
@@ -326,7 +326,8 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
326326
prev + type_start
327327
};
328328

329-
const TYPE_DEFAULT_NOT_ALLOWED: &'static str = "defaults for type parameters are only allowed in \
329+
const TYPE_DEFAULT_NOT_ALLOWED: &'static str =
330+
"defaults for type parameters are only allowed in \
330331
`struct`, `enum`, `type`, or `trait` definitions";
331332

332333
own_params.extend(hir_generics.params.iter().filter_map(|param| match param.kind {

‎compiler/rustc_hir_analysis/src/collect/predicates_of.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_hir::intravisit::{self, Visitor};
99
use rustc_middle::ty::{self, GenericPredicates, ImplTraitInTraitData, Ty, TyCtxt, Upcast};
1010
use rustc_middle::{bug, span_bug};
1111
use rustc_span::symbol::Ident;
12-
use rustc_span::{DUMMY_SP, Span};
12+
use rustc_span::{Span, DUMMY_SP};
1313
use tracing::{debug, instrument, trace};
1414

1515
use crate::bounds::Bounds;
@@ -379,10 +379,10 @@ fn compute_bidirectional_outlives_predicates<'tcx>(
379379
for param in opaque_own_params {
380380
let orig_lifetime = tcx.map_opaque_lifetime_to_parent_lifetime(param.def_id.expect_local());
381381
if let ty::ReEarlyParam(..) = *orig_lifetime {
382-
let dup_lifetime = ty::Region::new_early_param(tcx, ty::EarlyParamRegion {
383-
index: param.index,
384-
name: param.name,
385-
});
382+
let dup_lifetime = ty::Region::new_early_param(
383+
tcx,
384+
ty::EarlyParamRegion { index: param.index, name: param.name },
385+
);
386386
let span = tcx.def_span(param.def_id);
387387
predicates.push((
388388
ty::ClauseKind::RegionOutlives(ty::OutlivesPredicate(orig_lifetime, dup_lifetime))

‎compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
521521
_ => {}
522522
}
523523
match item.kind {
524-
hir::ItemKind::Fn(_, generics, _) => {
524+
hir::ItemKind::Fn(_, generics, _, _) => {
525525
self.visit_early_late(item.hir_id(), generics, |this| {
526526
intravisit::walk_item(this, item);
527527
});

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/lint.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use rustc_errors::codes::*;
33
use rustc_errors::{Diag, EmissionGuarantee, ErrorGuaranteed, StashKey, Suggestions};
44
use rustc_hir as hir;
55
use rustc_hir::def::{DefKind, Res};
6-
use rustc_lint_defs::Applicability;
76
use rustc_lint_defs::builtin::BARE_TRAIT_OBJECTS;
7+
use rustc_lint_defs::Applicability;
88
use rustc_span::Span;
99
use rustc_trait_selection::error_reporting::traits::suggestions::NextTypeParamName;
1010

@@ -189,7 +189,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
189189
// 2. Functions inside trait blocks
190190
// 3. Functions inside impl blocks
191191
let (sig, generics) = match tcx.hir_node_by_def_id(parent_id) {
192-
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(sig, generics, _), .. }) => {
192+
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(sig, generics, _, _), .. }) => {
193193
(sig, generics)
194194
}
195195
hir::Node::TraitItem(hir::TraitItem {

‎compiler/rustc_hir_pretty/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ impl<'a> State<'a> {
522522
self.word(";");
523523
self.end(); // end the outer cbox
524524
}
525-
hir::ItemKind::Fn(ref sig, generics, body) => {
525+
hir::ItemKind::Fn(ref sig, generics, _fn_contract_ids, body) => {
526526
self.head("");
527527
self.print_fn(
528528
sig.decl,

‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1988,7 +1988,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
19881988
fn parent_item_span(&self, id: HirId) -> Option<Span> {
19891989
let node = self.tcx.hir_node_by_def_id(self.tcx.hir().get_parent_item(id).def_id);
19901990
match node {
1991-
Node::Item(&hir::Item { kind: hir::ItemKind::Fn(_, _, body_id), .. })
1991+
Node::Item(&hir::Item { kind: hir::ItemKind::Fn(_, _, _, body_id), .. })
19921992
| Node::ImplItem(&hir::ImplItem { kind: hir::ImplItemKind::Fn(_, body_id), .. }) => {
19931993
let body = self.tcx.hir().body(body_id);
19941994
if let ExprKind::Block(block, _) = &body.value.kind {

‎compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

+1
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
989989
..
990990
},
991991
hir::Generics { params, predicates, .. },
992+
_,
992993
_body_id,
993994
),
994995
..

‎compiler/rustc_hir_typeck/src/upvar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,7 @@ fn drop_location_span(tcx: TyCtxt<'_>, hir_id: HirId) -> Span {
19241924
let owner_node = tcx.hir_node(owner_id);
19251925
let owner_span = match owner_node {
19261926
hir::Node::Item(item) => match item.kind {
1927-
hir::ItemKind::Fn(_, _, owner_id) => tcx.hir().span(owner_id.hir_id),
1927+
hir::ItemKind::Fn(_, _, _, owner_id) => tcx.hir().span(owner_id.hir_id),
19281928
_ => {
19291929
bug!("Drop location span error: need to handle more ItemKind '{:?}'", item.kind);
19301930
}

‎compiler/rustc_lint/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ impl<'tcx> LateLintPass<'tcx> for InvalidNoMangleItems {
10371037
}
10381038
};
10391039
match it.kind {
1040-
hir::ItemKind::Fn(.., generics, _) => {
1040+
hir::ItemKind::Fn(.., generics, _, _) => {
10411041
if let Some(no_mangle_attr) = attr::find_by_name(attrs, sym::no_mangle) {
10421042
check_no_mangle_on_generic_fn(no_mangle_attr, None, generics, it.span);
10431043
}

‎compiler/rustc_passes/src/check_attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1531,7 +1531,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
15311531
};
15321532

15331533
let Some(ItemLike::Item(Item {
1534-
kind: ItemKind::Fn(FnSig { decl, .. }, generics, _), ..
1534+
kind: ItemKind::Fn(FnSig { decl, .. }, generics, _, _), ..
15351535
})) = item
15361536
else {
15371537
bug!("should be a function item");

‎compiler/rustc_passes/src/naked_functions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fn check_mod_naked_functions(tcx: TyCtxt<'_>, module_def_id: LocalModDefId) {
3131
}
3232

3333
let (fn_header, body_id) = match tcx.hir_node_by_def_id(def_id) {
34-
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(sig, _, body_id), .. })
34+
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(sig, _, _, body_id), .. })
3535
| hir::Node::TraitItem(hir::TraitItem {
3636
kind: hir::TraitItemKind::Fn(sig, hir::TraitFn::Provided(body_id)),
3737
..

‎compiler/rustc_passes/src/stability.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ impl<'a, 'tcx> Visitor<'tcx> for Annotator<'a, 'tcx> {
380380
)
381381
}
382382
}
383-
hir::ItemKind::Fn(ref item_fn_sig, _, _) => {
383+
hir::ItemKind::Fn(ref item_fn_sig, _, _, _) => {
384384
fn_sig = Some(item_fn_sig);
385385
}
386386
_ => {}

‎compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
17291729
return None;
17301730
};
17311731
let tykind = match self.tcx.hir_node_by_def_id(trace.cause.body_id) {
1732-
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, _, body_id), .. }) => {
1732+
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, _, _, body_id), .. }) => {
17331733
let body = hir.body(*body_id);
17341734
struct LetVisitor {
17351735
span: Span,

‎compiler/rustc_trait_selection/src/error_reporting/infer/suggest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
816816
pat.walk(&mut find_compatible_candidates);
817817
}
818818

819-
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, _, body), .. })
819+
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, _, _, body), .. })
820820
| hir::Node::ImplItem(hir::ImplItem {
821821
kind: hir::ImplItemKind::Fn(_, body), ..
822822
})

‎compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
898898
}
899899
let hir_id = self.tcx.local_def_id_to_hir_id(obligation.cause.body_id);
900900
let body_id = match self.tcx.hir_node(hir_id) {
901-
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, _, body_id), .. }) => body_id,
901+
hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(_, _, _, body_id), .. }) => body_id,
902902
_ => return false,
903903
};
904904
let ControlFlow::Break(expr) = (FindMethodSubexprOfTry { search_span: span })

0 commit comments

Comments
 (0)
Please sign in to comment.