Skip to content

Commit f62cda3

Browse files
mu001999mu001999
committed
Add span field for ConstArg
1 parent b0698b4 commit f62cda3

20 files changed

Lines changed: 111 additions & 78 deletions

File tree

‎compiler/rustc_ast_lowering/src/index.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
312312

313313
fn visit_const_arg(&mut self, const_arg: &'hir ConstArg<'hir, AmbigArg>) {
314314
self.insert(
315-
const_arg.as_unambig_ct().span(),
315+
const_arg.as_unambig_ct().span,
316316
const_arg.hir_id,
317317
Node::ConstArg(const_arg.as_unambig_ct()),
318318
);

‎compiler/rustc_ast_lowering/src/lib.rs‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2283,8 +2283,12 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
22832283
// `ExprKind::Paren(ExprKind::Underscore)` and should also be lowered to `GenericArg::Infer`
22842284
match c.value.peel_parens().kind {
22852285
ExprKind::Underscore => {
2286-
let ct_kind = hir::ConstArgKind::Infer(self.lower_span(c.value.span), ());
2287-
self.arena.alloc(hir::ConstArg { hir_id: self.lower_node_id(c.id), kind: ct_kind })
2286+
let ct_kind = hir::ConstArgKind::Infer(());
2287+
self.arena.alloc(hir::ConstArg {
2288+
hir_id: self.lower_node_id(c.id),
2289+
kind: ct_kind,
2290+
span: self.lower_span(c.value.span),
2291+
})
22882292
}
22892293
_ => self.lower_anon_const_to_const_arg(c),
22902294
}
@@ -2354,7 +2358,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
23542358
hir::ConstArgKind::Anon(ct)
23552359
};
23562360

2357-
self.arena.alloc(hir::ConstArg { hir_id: self.next_id(), kind: ct_kind })
2361+
self.arena.alloc(hir::ConstArg {
2362+
hir_id: self.next_id(),
2363+
kind: ct_kind,
2364+
span: self.lower_span(span),
2365+
})
23582366
}
23592367

23602368
fn lower_const_item_rhs(
@@ -2371,9 +2379,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
23712379
let const_arg = ConstArg {
23722380
hir_id: self.next_id(),
23732381
kind: hir::ConstArgKind::Error(
2374-
DUMMY_SP,
23752382
self.dcx().span_delayed_bug(DUMMY_SP, "no block"),
23762383
),
2384+
span: DUMMY_SP,
23772385
};
23782386
hir::ConstItemRhs::TypeConst(self.arena.alloc(const_arg))
23792387
}
@@ -2386,13 +2394,15 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
23862394

23872395
#[instrument(level = "debug", skip(self), ret)]
23882396
fn lower_expr_to_const_arg_direct(&mut self, expr: &Expr) -> hir::ConstArg<'hir> {
2397+
let span = self.lower_span(expr.span);
2398+
23892399
let overly_complex_const = |this: &mut Self| {
23902400
let e = this.dcx().struct_span_err(
23912401
expr.span,
23922402
"complex const arguments must be placed inside of a `const` block",
23932403
);
23942404

2395-
ConstArg { hir_id: this.next_id(), kind: hir::ConstArgKind::Error(expr.span, e.emit()) }
2405+
ConstArg { hir_id: this.next_id(), kind: hir::ConstArgKind::Error(e.emit()), span }
23962406
};
23972407

23982408
match &expr.kind {
@@ -2423,6 +2433,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
24232433
ConstArg {
24242434
hir_id: self.next_id(),
24252435
kind: hir::ConstArgKind::TupleCall(qpath, lowered_args),
2436+
span,
24262437
}
24272438
}
24282439
ExprKind::Tup(exprs) => {
@@ -2440,7 +2451,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
24402451
&*self.arena.alloc(expr)
24412452
}));
24422453

2443-
ConstArg { hir_id: self.next_id(), kind: hir::ConstArgKind::Tup(expr.span, exprs) }
2454+
ConstArg { hir_id: self.next_id(), kind: hir::ConstArgKind::Tup(exprs), span }
24442455
}
24452456
ExprKind::Path(qself, path) => {
24462457
let qpath = self.lower_qpath(
@@ -2454,7 +2465,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
24542465
None,
24552466
);
24562467

2457-
ConstArg { hir_id: self.next_id(), kind: hir::ConstArgKind::Path(qpath) }
2468+
ConstArg { hir_id: self.next_id(), kind: hir::ConstArgKind::Path(qpath), span }
24582469
}
24592470
ExprKind::Struct(se) => {
24602471
let path = self.lower_qpath(
@@ -2495,11 +2506,16 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
24952506
})
24962507
}));
24972508

2498-
ConstArg { hir_id: self.next_id(), kind: hir::ConstArgKind::Struct(path, fields) }
2509+
ConstArg {
2510+
hir_id: self.next_id(),
2511+
kind: hir::ConstArgKind::Struct(path, fields),
2512+
span,
2513+
}
24992514
}
25002515
ExprKind::Underscore => ConstArg {
25012516
hir_id: self.lower_node_id(expr.id),
2502-
kind: hir::ConstArgKind::Infer(expr.span, ()),
2517+
kind: hir::ConstArgKind::Infer(()),
2518+
span,
25032519
},
25042520
ExprKind::Block(block, _) => {
25052521
if let [stmt] = block.stmts.as_slice()
@@ -2541,7 +2557,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
25412557
return match anon.mgca_disambiguation {
25422558
MgcaDisambiguation::AnonConst => {
25432559
let lowered_anon = self.lower_anon_const_to_anon_const(anon);
2544-
ConstArg { hir_id: self.next_id(), kind: hir::ConstArgKind::Anon(lowered_anon) }
2560+
ConstArg {
2561+
hir_id: self.next_id(),
2562+
kind: hir::ConstArgKind::Anon(lowered_anon),
2563+
span: lowered_anon.span,
2564+
}
25452565
}
25462566
MgcaDisambiguation::Direct => self.lower_expr_to_const_arg_direct(&anon.value),
25472567
};
@@ -2578,11 +2598,16 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
25782598
return ConstArg {
25792599
hir_id: self.lower_node_id(anon.id),
25802600
kind: hir::ConstArgKind::Path(qpath),
2601+
span: self.lower_span(expr.span),
25812602
};
25822603
}
25832604

25842605
let lowered_anon = self.lower_anon_const_to_anon_const(anon);
2585-
ConstArg { hir_id: self.next_id(), kind: hir::ConstArgKind::Anon(lowered_anon) }
2606+
ConstArg {
2607+
hir_id: self.next_id(),
2608+
kind: hir::ConstArgKind::Anon(lowered_anon),
2609+
span: self.lower_span(expr.span),
2610+
}
25862611
}
25872612

25882613
/// See [`hir::ConstArg`] for when to use this function vs

‎compiler/rustc_ast_lowering/src/pat.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
511511
self.arena.alloc(hir::ConstArg {
512512
hir_id: self.next_id(),
513513
kind: hir::ConstArgKind::Anon(self.arena.alloc(anon_const)),
514+
span,
514515
})
515516
}
516517

@@ -555,6 +556,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
555556
})
556557
});
557558
let hir_id = self.next_id();
558-
self.arena.alloc(hir::ConstArg { kind: hir::ConstArgKind::Anon(ct), hir_id })
559+
self.arena.alloc(hir::ConstArg { kind: hir::ConstArgKind::Anon(ct), hir_id, span })
559560
}
560561
}

‎compiler/rustc_hir/src/hir.rs‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ impl<'hir> ConstItemRhs<'hir> {
423423
pub fn span<'tcx>(&self, tcx: impl crate::intravisit::HirTyCtxt<'tcx>) -> Span {
424424
match self {
425425
ConstItemRhs::Body(body_id) => tcx.hir_body(*body_id).value.span,
426-
ConstItemRhs::TypeConst(ct_arg) => ct_arg.span(),
426+
ConstItemRhs::TypeConst(ct_arg) => ct_arg.span,
427427
}
428428
}
429429
}
@@ -447,6 +447,7 @@ pub struct ConstArg<'hir, Unambig = ()> {
447447
#[stable_hasher(ignore)]
448448
pub hir_id: HirId,
449449
pub kind: ConstArgKind<'hir, Unambig>,
450+
pub span: Span,
450451
}
451452

452453
impl<'hir> ConstArg<'hir, AmbigArg> {
@@ -475,7 +476,7 @@ impl<'hir> ConstArg<'hir> {
475476
/// Functions accepting ambiguous consts will not handle the [`ConstArgKind::Infer`] variant, if
476477
/// infer consts are relevant to you then care should be taken to handle them separately.
477478
pub fn try_as_ambig_ct(&self) -> Option<&ConstArg<'hir, AmbigArg>> {
478-
if let ConstArgKind::Infer(_, ()) = self.kind {
479+
if let ConstArgKind::Infer(()) = self.kind {
479480
return None;
480481
}
481482

@@ -494,25 +495,13 @@ impl<'hir, Unambig> ConstArg<'hir, Unambig> {
494495
_ => None,
495496
}
496497
}
497-
498-
pub fn span(&self) -> Span {
499-
match self.kind {
500-
ConstArgKind::Tup(span, ..) => span,
501-
ConstArgKind::Struct(path, _) => path.span(),
502-
ConstArgKind::Path(path) => path.span(),
503-
ConstArgKind::TupleCall(path, _) => path.span(),
504-
ConstArgKind::Anon(anon) => anon.span,
505-
ConstArgKind::Error(span, _) => span,
506-
ConstArgKind::Infer(span, _) => span,
507-
}
508-
}
509498
}
510499

511500
/// See [`ConstArg`].
512501
#[derive(Clone, Copy, Debug, HashStable_Generic)]
513502
#[repr(u8, C)]
514503
pub enum ConstArgKind<'hir, Unambig = ()> {
515-
Tup(Span, &'hir [&'hir ConstArg<'hir, Unambig>]),
504+
Tup(&'hir [&'hir ConstArg<'hir, Unambig>]),
516505
/// **Note:** Currently this is only used for bare const params
517506
/// (`N` where `fn foo<const N: usize>(...)`),
518507
/// not paths to any const (`N` where `const N: usize = ...`).
@@ -525,10 +514,10 @@ pub enum ConstArgKind<'hir, Unambig = ()> {
525514
/// Tuple constructor variant
526515
TupleCall(QPath<'hir>, &'hir [&'hir ConstArg<'hir>]),
527516
/// Error const
528-
Error(Span, ErrorGuaranteed),
517+
Error(ErrorGuaranteed),
529518
/// This variant is not always used to represent inference consts, sometimes
530519
/// [`GenericArg::Infer`] is used instead.
531-
Infer(Span, Unambig),
520+
Infer(Unambig),
532521
}
533522

534523
#[derive(Clone, Copy, Debug, HashStable_Generic)]
@@ -574,7 +563,7 @@ impl GenericArg<'_> {
574563
match self {
575564
GenericArg::Lifetime(l) => l.ident.span,
576565
GenericArg::Type(t) => t.span,
577-
GenericArg::Const(c) => c.span(),
566+
GenericArg::Const(c) => c.span,
578567
GenericArg::Infer(i) => i.span,
579568
}
580569
}

‎compiler/rustc_hir/src/hir/tests.rs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,16 @@ define_tests! {
2424
cast_ptr TyKind Ptr { 0: MutTy { ty: &Ty { span: DUMMY_SP, hir_id: HirId::INVALID, kind: TyKind::Never }, mutbl: Mutability::Not }}
2525
cast_array TyKind Array {
2626
0: &Ty { span: DUMMY_SP, hir_id: HirId::INVALID, kind: TyKind::Never },
27-
1: &ConstArg { hir_id: HirId::INVALID, kind: ConstArgKind::Anon(&AnonConst {
27+
1: &ConstArg {
2828
hir_id: HirId::INVALID,
29-
def_id: LocalDefId { local_def_index: DefIndex::ZERO },
30-
body: BodyId { hir_id: HirId::INVALID },
29+
kind: ConstArgKind::Anon(&AnonConst {
30+
hir_id: HirId::INVALID,
31+
def_id: LocalDefId { local_def_index: DefIndex::ZERO },
32+
body: BodyId { hir_id: HirId::INVALID },
33+
span: DUMMY_SP,
34+
}),
3135
span: DUMMY_SP,
32-
})}
36+
},
3337
}
3438

3539
cast_anon ConstArgKind Anon {

‎compiler/rustc_hir/src/intravisit.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,8 +1068,8 @@ pub fn walk_unambig_const_arg<'v, V: Visitor<'v>>(
10681068
match const_arg.try_as_ambig_ct() {
10691069
Some(ambig_ct) => visitor.visit_const_arg(ambig_ct),
10701070
None => {
1071-
let ConstArg { hir_id, kind: _ } = const_arg;
1072-
visitor.visit_infer(*hir_id, const_arg.span(), InferKind::Const(const_arg))
1071+
let ConstArg { hir_id, kind: _, span } = const_arg;
1072+
visitor.visit_infer(*hir_id, *span, InferKind::Const(const_arg))
10731073
}
10741074
}
10751075
}
@@ -1078,10 +1078,10 @@ pub fn walk_const_arg<'v, V: Visitor<'v>>(
10781078
visitor: &mut V,
10791079
const_arg: &'v ConstArg<'v, AmbigArg>,
10801080
) -> V::Result {
1081-
let ConstArg { hir_id, kind } = const_arg;
1081+
let ConstArg { hir_id, kind, span: _ } = const_arg;
10821082
try_visit!(visitor.visit_id(*hir_id));
10831083
match kind {
1084-
ConstArgKind::Tup(_, exprs) => {
1084+
ConstArgKind::Tup(exprs) => {
10851085
walk_list!(visitor, visit_const_arg, *exprs);
10861086
V::Result::output()
10871087
}
@@ -1103,7 +1103,7 @@ pub fn walk_const_arg<'v, V: Visitor<'v>>(
11031103
}
11041104
ConstArgKind::Path(qpath) => visitor.visit_qpath(qpath, *hir_id, qpath.span()),
11051105
ConstArgKind::Anon(anon) => visitor.visit_anon_const(*anon),
1106-
ConstArgKind::Error(_, _) => V::Result::output(), // errors and spans are not important
1106+
ConstArgKind::Error(_) => V::Result::output(), // errors and spans are not important
11071107
}
11081108
}
11091109

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
381381
{
382382
let span = match term {
383383
hir::Term::Ty(ty) => ty.span,
384-
hir::Term::Const(ct) => ct.span(),
384+
hir::Term::Const(ct) => ct.span,
385385
};
386386
(span, Some(ident.span), assoc_item.as_tag(), assoc_tag)
387387
} else {
@@ -1466,7 +1466,7 @@ pub fn prohibit_assoc_item_constraint(
14661466
hir::AssocItemConstraintKind::Equality { term: hir::Term::Const(c) },
14671467
GenericParamDefKind::Const { .. },
14681468
) => {
1469-
suggest_direct_use(&mut err, c.span());
1469+
suggest_direct_use(&mut err, c.span);
14701470
}
14711471
(hir::AssocItemConstraintKind::Bound { bounds }, _) => {
14721472
// Suggest `impl<T: Bound> Trait<T> for Foo` when finding

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,7 +2325,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
23252325
&& (anon_const_type.has_free_regions() || anon_const_type.has_erased_regions())
23262326
{
23272327
let e = self.dcx().span_err(
2328-
const_arg.span(),
2328+
const_arg.span,
23292329
"anonymous constants with lifetimes in their type are not yet supported",
23302330
);
23312331
tcx.feed_anon_const_type(anon.def_id, ty::EarlyBinder::bind(Ty::new_error(tcx, e)));
@@ -2336,7 +2336,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
23362336
// variables otherwise we will ICE.
23372337
if anon_const_type.has_non_region_infer() {
23382338
let e = self.dcx().span_err(
2339-
const_arg.span(),
2339+
const_arg.span,
23402340
"anonymous constants with inferred types are not yet supported",
23412341
);
23422342
tcx.feed_anon_const_type(anon.def_id, ty::EarlyBinder::bind(Ty::new_error(tcx, e)));
@@ -2346,7 +2346,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
23462346
// give the anon const any of the generics from the parent.
23472347
if anon_const_type.has_non_region_param() {
23482348
let e = self.dcx().span_err(
2349-
const_arg.span(),
2349+
const_arg.span,
23502350
"anonymous constants referencing generics are not yet supported",
23512351
);
23522352
tcx.feed_anon_const_type(anon.def_id, ty::EarlyBinder::bind(Ty::new_error(tcx, e)));
@@ -2358,7 +2358,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
23582358

23592359
let hir_id = const_arg.hir_id;
23602360
match const_arg.kind {
2361-
hir::ConstArgKind::Tup(span, exprs) => self.lower_const_arg_tup(exprs, feed, span),
2361+
hir::ConstArgKind::Tup(exprs) => self.lower_const_arg_tup(exprs, feed, const_arg.span),
23622362
hir::ConstArgKind::Path(hir::QPath::Resolved(maybe_qself, path)) => {
23632363
debug!(?maybe_qself, ?path);
23642364
let opt_self_ty = maybe_qself.as_ref().map(|qself| self.lower_ty(qself));
@@ -2372,19 +2372,19 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
23722372
hir_self_ty,
23732373
segment,
23742374
hir_id,
2375-
const_arg.span(),
2375+
const_arg.span,
23762376
)
23772377
.unwrap_or_else(|guar| Const::new_error(tcx, guar))
23782378
}
23792379
hir::ConstArgKind::Struct(qpath, inits) => {
2380-
self.lower_const_arg_struct(hir_id, qpath, inits, const_arg.span())
2380+
self.lower_const_arg_struct(hir_id, qpath, inits, const_arg.span)
23812381
}
23822382
hir::ConstArgKind::TupleCall(qpath, args) => {
2383-
self.lower_const_arg_tuple_call(hir_id, qpath, args, const_arg.span())
2383+
self.lower_const_arg_tuple_call(hir_id, qpath, args, const_arg.span)
23842384
}
23852385
hir::ConstArgKind::Anon(anon) => self.lower_const_arg_anon(anon),
2386-
hir::ConstArgKind::Infer(span, ()) => self.ct_infer(None, span),
2387-
hir::ConstArgKind::Error(_, e) => ty::Const::new_error(tcx, e),
2386+
hir::ConstArgKind::Infer(()) => self.ct_infer(None, const_arg.span),
2387+
hir::ConstArgKind::Error(e) => ty::Const::new_error(tcx, e),
23882388
}
23892389
}
23902390

‎compiler/rustc_hir_pretty/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,13 +1137,13 @@ impl<'a> State<'a> {
11371137

11381138
fn print_const_arg(&mut self, const_arg: &hir::ConstArg<'_>) {
11391139
match &const_arg.kind {
1140-
ConstArgKind::Tup(_, exprs) => {
1140+
ConstArgKind::Tup(exprs) => {
11411141
self.popen();
11421142
self.commasep_cmnt(
11431143
Inconsistent,
11441144
exprs,
11451145
|s, arg| s.print_const_arg(arg),
1146-
|arg| arg.span(),
1146+
|arg| arg.span,
11471147
);
11481148
self.pclose();
11491149
}
@@ -1152,7 +1152,7 @@ impl<'a> State<'a> {
11521152
ConstArgKind::TupleCall(..) => self.word("/* TUPLE CALL */"),
11531153
ConstArgKind::Path(qpath) => self.print_qpath(qpath, true),
11541154
ConstArgKind::Anon(anon) => self.print_anon_const(anon),
1155-
ConstArgKind::Error(_, _) => self.word("/*ERROR*/"),
1155+
ConstArgKind::Error(_) => self.word("/*ERROR*/"),
11561156
ConstArgKind::Infer(..) => self.word("_"),
11571157
}
11581158
}

0 commit comments

Comments
 (0)