Skip to content

Commit 9e5c5c5

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of #97935 - nnethercote:rename-ConstS-val-as-kind, r=lcnr
Rename the `ConstS::val` field as `kind`. And likewise for the `Const::val` method. Because its type is called `ConstKind`. Also `val` is a confusing name because `ConstKind` is an enum with seven variants, one of which is called `Value`. Also, this gives consistency with `TyS` and `PredicateS` which have `kind` fields. The commit also renames a few `Const` variables from `val` to `c`, to avoid confusion with the `ConstKind::Value` variant. r? `@BoxyUwU`
2 parents 4b1d510 + 93e4b6e commit 9e5c5c5

File tree

74 files changed

+173
-169
lines changed

Some content is hidden

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

74 files changed

+173
-169
lines changed

‎compiler/rustc_borrowck/src/type_check/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ impl<'a, 'b, 'tcx> Visitor<'tcx> for TypeVerifier<'a, 'b, 'tcx> {
378378
} else {
379379
let tcx = self.tcx();
380380
let maybe_uneval = match constant.literal {
381-
ConstantKind::Ty(ct) => match ct.val() {
381+
ConstantKind::Ty(ct) => match ct.kind() {
382382
ty::ConstKind::Unevaluated(uv) => Some(uv),
383383
_ => None,
384384
},
@@ -1841,7 +1841,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
18411841
fn check_operand(&mut self, op: &Operand<'tcx>, location: Location) {
18421842
if let Operand::Constant(constant) = op {
18431843
let maybe_uneval = match constant.literal {
1844-
ConstantKind::Ty(ct) => match ct.val() {
1844+
ConstantKind::Ty(ct) => match ct.kind() {
18451845
ty::ConstKind::Unevaluated(uv) => Some(uv),
18461846
_ => None,
18471847
},

‎compiler/rustc_codegen_cranelift/src/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ fn codegen_stmt<'tcx>(
710710
let times = fx
711711
.monomorphize(times)
712712
.eval(fx.tcx, ParamEnv::reveal_all())
713-
.val()
713+
.kind()
714714
.try_to_bits(fx.tcx.data_layout.pointer_size)
715715
.unwrap();
716716
if operand.layout().size.bytes() == 0 {

‎compiler/rustc_codegen_cranelift/src/constant.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub(crate) fn check_constants(fx: &mut FunctionCx<'_, '_, '_>) -> bool {
4545
ConstantKind::Ty(ct) => ct,
4646
ConstantKind::Val(..) => continue,
4747
};
48-
match const_.val() {
48+
match const_.kind() {
4949
ConstKind::Value(_) => {}
5050
ConstKind::Unevaluated(unevaluated) => {
5151
if let Err(err) =
@@ -126,7 +126,7 @@ pub(crate) fn codegen_constant<'tcx>(
126126
ConstantKind::Ty(ct) => ct,
127127
ConstantKind::Val(val, ty) => return codegen_const_value(fx, val, ty),
128128
};
129-
let const_val = match const_.val() {
129+
let const_val = match const_.kind() {
130130
ConstKind::Value(const_val) => const_val,
131131
ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted })
132132
if fx.tcx.is_static(def.did) =>
@@ -469,7 +469,7 @@ pub(crate) fn mir_operand_get_const_val<'tcx>(
469469
match operand {
470470
Operand::Constant(const_) => match const_.literal {
471471
ConstantKind::Ty(const_) => {
472-
fx.monomorphize(const_).eval(fx.tcx, ParamEnv::reveal_all()).val().try_to_value()
472+
fx.monomorphize(const_).eval(fx.tcx, ParamEnv::reveal_all()).kind().try_to_value()
473473
}
474474
ConstantKind::Val(val, _) => Some(val),
475475
},

‎compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,15 @@ fn push_debuginfo_type_name<'tcx>(
180180
if cpp_like_debuginfo {
181181
output.push_str("array$<");
182182
push_debuginfo_type_name(tcx, inner_type, true, output, visited);
183-
match len.val() {
183+
match len.kind() {
184184
ty::ConstKind::Param(param) => write!(output, ",{}>", param.name).unwrap(),
185185
_ => write!(output, ",{}>", len.eval_usize(tcx, ty::ParamEnv::reveal_all()))
186186
.unwrap(),
187187
}
188188
} else {
189189
output.push('[');
190190
push_debuginfo_type_name(tcx, inner_type, true, output, visited);
191-
match len.val() {
191+
match len.kind() {
192192
ty::ConstKind::Param(param) => write!(output, "; {}]", param.name).unwrap(),
193193
_ => write!(output, "; {}]", len.eval_usize(tcx, ty::ParamEnv::reveal_all()))
194194
.unwrap(),
@@ -679,7 +679,7 @@ fn push_generic_params_internal<'tcx>(
679679
}
680680

681681
fn push_const_param<'tcx>(tcx: TyCtxt<'tcx>, ct: ty::Const<'tcx>, output: &mut String) {
682-
match ct.val() {
682+
match ct.kind() {
683683
ty::ConstKind::Param(param) => {
684684
write!(output, "{}", param.name)
685685
}
@@ -703,7 +703,7 @@ fn push_const_param<'tcx>(tcx: TyCtxt<'tcx>, ct: ty::Const<'tcx>, output: &mut S
703703
// but we get a deterministic, virtually unique value for the constant.
704704
let hcx = &mut tcx.create_stable_hashing_context();
705705
let mut hasher = StableHasher::new();
706-
hcx.while_hashing_spans(false, |hcx| ct.val().hash_stable(hcx, &mut hasher));
706+
hcx.while_hashing_spans(false, |hcx| ct.kind().hash_stable(hcx, &mut hasher));
707707
// Let's only emit 64 bits of the hash value. That should be plenty for
708708
// avoiding collisions and will make the emitted type names shorter.
709709
let hash: u64 = hasher.finish();

‎compiler/rustc_codegen_ssa/src/mir/constant.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
2929
mir::ConstantKind::Ty(ct) => ct,
3030
mir::ConstantKind::Val(val, _) => return Ok(val),
3131
};
32-
match ct.val() {
32+
match ct.kind() {
3333
ty::ConstKind::Unevaluated(ct) => self
3434
.cx
3535
.tcx()
@@ -65,7 +65,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
6565
.fields
6666
.iter()
6767
.map(|field| {
68-
if let Some(prim) = field.val().try_to_scalar() {
68+
if let Some(prim) = field.kind().try_to_scalar() {
6969
let layout = bx.layout_of(field_ty);
7070
let Abi::Scalar(scalar) = layout.abi else {
7171
bug!("from_const: invalid ByVal layout: {:#?}", layout);

‎compiler/rustc_const_eval/src/const_eval/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ pub(crate) fn deref_const<'tcx>(
197197
},
198198
};
199199

200-
tcx.mk_const(ty::ConstS { val: ty::ConstKind::Value(op_to_const(&ecx, &mplace.into())), ty })
200+
tcx.mk_const(ty::ConstS { kind: ty::ConstKind::Value(op_to_const(&ecx, &mplace.into())), ty })
201201
}
202202

203203
#[instrument(skip(tcx), level = "debug")]

‎compiler/rustc_const_eval/src/interpret/operand.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -622,10 +622,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
622622
/// "universe" (param_env).
623623
pub fn const_to_op(
624624
&self,
625-
val: ty::Const<'tcx>,
625+
c: ty::Const<'tcx>,
626626
layout: Option<TyAndLayout<'tcx>>,
627627
) -> InterpResult<'tcx, OpTy<'tcx, M::PointerTag>> {
628-
match val.val() {
628+
match c.kind() {
629629
ty::ConstKind::Param(_) | ty::ConstKind::Bound(..) => throw_inval!(TooGeneric),
630630
ty::ConstKind::Error(DelaySpanBugEmitted { reported, .. }) => {
631631
throw_inval!(AlreadyReported(reported))
@@ -635,9 +635,9 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
635635
Ok(self.eval_to_allocation(GlobalId { instance, promoted: uv.promoted })?.into())
636636
}
637637
ty::ConstKind::Infer(..) | ty::ConstKind::Placeholder(..) => {
638-
span_bug!(self.cur_span(), "const_to_op: Unexpected ConstKind {:?}", val)
638+
span_bug!(self.cur_span(), "const_to_op: Unexpected ConstKind {:?}", c)
639639
}
640-
ty::ConstKind::Value(val_val) => self.const_val_to_op(val_val, val.ty(), layout),
640+
ty::ConstKind::Value(val) => self.const_val_to_op(val, c.ty(), layout),
641641
}
642642
}
643643

‎compiler/rustc_const_eval/src/interpret/util.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ where
5555
assert!(matches!(ty.kind(), ty::Param(_)))
5656
}
5757
ty::subst::GenericArgKind::Const(ct) => {
58-
assert!(matches!(ct.val(), ty::ConstKind::Param(_)))
58+
assert!(matches!(ct.kind(), ty::ConstKind::Param(_)))
5959
}
6060
ty::subst::GenericArgKind::Lifetime(..) => (),
6161
},
@@ -69,7 +69,7 @@ where
6969
}
7070

7171
fn visit_const(&mut self, c: ty::Const<'tcx>) -> ControlFlow<Self::BreakTy> {
72-
match c.val() {
72+
match c.kind() {
7373
ty::ConstKind::Param(..) => ControlFlow::Break(FoundParam),
7474
_ => c.super_visit_with(self),
7575
}

‎compiler/rustc_const_eval/src/transform/check_consts/qualifs.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,8 @@ where
353353

354354
// Check the qualifs of the value of `const` items.
355355
if let Some(ct) = constant.literal.const_for_ty() {
356-
if let ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs: _, promoted }) = ct.val() {
356+
if let ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs: _, promoted }) = ct.kind()
357+
{
357358
// Use qualifs of the type for the promoted. Promoteds in MIR body should be possible
358359
// only for `NeedsNonConstDrop` with precise drop checking. This is the only const
359360
// check performed after the promotion. Verify that with an assertion.

‎compiler/rustc_const_eval/src/transform/promote_consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ impl<'a, 'tcx> Promoter<'a, 'tcx> {
842842
literal: tcx
843843
.mk_const(ty::ConstS {
844844
ty,
845-
val: ty::ConstKind::Unevaluated(ty::Unevaluated {
845+
kind: ty::ConstKind::Unevaluated(ty::Unevaluated {
846846
def,
847847
substs: InternalSubsts::for_item(tcx, def.did, |param, _| {
848848
if let ty::GenericParamDefKind::Lifetime = param.kind {

‎compiler/rustc_infer/src/infer/canonical/canonicalizer.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> {
476476
}
477477

478478
fn fold_const(&mut self, ct: ty::Const<'tcx>) -> ty::Const<'tcx> {
479-
match ct.val() {
479+
match ct.kind() {
480480
ty::ConstKind::Infer(InferConst::Var(vid)) => {
481481
debug!("canonical: const var found with vid {:?}", vid);
482482
match self.infcx.probe_const_var(vid) {
@@ -778,7 +778,7 @@ impl<'cx, 'tcx> Canonicalizer<'cx, 'tcx> {
778778
} else {
779779
let var = self.canonical_var(info, const_var.into());
780780
self.tcx().mk_const(ty::ConstS {
781-
val: ty::ConstKind::Bound(self.binder_index, var),
781+
kind: ty::ConstKind::Bound(self.binder_index, var),
782782
ty: self.fold_ty(const_var.ty()),
783783
})
784784
}

‎compiler/rustc_infer/src/infer/canonical/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
149149
let placeholder_mapped = ty::PlaceholderConst { universe: universe_mapped, name };
150150
self.tcx
151151
.mk_const(ty::ConstS {
152-
val: ty::ConstKind::Placeholder(placeholder_mapped),
152+
kind: ty::ConstKind::Placeholder(placeholder_mapped),
153153
ty: name.ty,
154154
})
155155
.into()

‎compiler/rustc_infer/src/infer/canonical/query_response.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
458458
}
459459
}
460460
GenericArgKind::Const(result_value) => {
461-
if let ty::ConstKind::Bound(debrujin, b) = result_value.val() {
461+
if let ty::ConstKind::Bound(debrujin, b) = result_value.kind() {
462462
// ...in which case we would set `canonical_vars[0]` to `Some(const X)`.
463463

464464
// We only allow a `ty::INNERMOST` index in substitutions.

‎compiler/rustc_infer/src/infer/combine.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
142142

143143
let a_is_expected = relation.a_is_expected();
144144

145-
match (a.val(), b.val()) {
145+
match (a.kind(), b.kind()) {
146146
(
147147
ty::ConstKind::Infer(InferConst::Var(a_vid)),
148148
ty::ConstKind::Infer(InferConst::Var(b_vid)),
@@ -726,7 +726,7 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
726726
) -> RelateResult<'tcx, ty::Const<'tcx>> {
727727
assert_eq!(c, c2); // we are abusing TypeRelation here; both LHS and RHS ought to be ==
728728

729-
match c.val() {
729+
match c.kind() {
730730
ty::ConstKind::Infer(InferConst::Var(vid)) => {
731731
let mut inner = self.infcx.inner.borrow_mut();
732732
let variable_table = &mut inner.const_unification_table();
@@ -761,7 +761,7 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
761761
)?;
762762
Ok(self.tcx().mk_const(ty::ConstS {
763763
ty: c.ty(),
764-
val: ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted }),
764+
kind: ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted }),
765765
}))
766766
}
767767
_ => relate::super_relate_consts(self, c, c),
@@ -941,7 +941,7 @@ impl<'tcx> TypeRelation<'tcx> for ConstInferUnifier<'_, 'tcx> {
941941
debug_assert_eq!(c, _c);
942942
debug!("ConstInferUnifier: c={:?}", c);
943943

944-
match c.val() {
944+
match c.kind() {
945945
ty::ConstKind::Infer(InferConst::Var(vid)) => {
946946
// Check if the current unification would end up
947947
// unifying `target_vid` with a const which contains
@@ -992,7 +992,7 @@ impl<'tcx> TypeRelation<'tcx> for ConstInferUnifier<'_, 'tcx> {
992992
)?;
993993
Ok(self.tcx().mk_const(ty::ConstS {
994994
ty: c.ty(),
995-
val: ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted }),
995+
kind: ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs, promoted }),
996996
}))
997997
}
998998
_ => relate::super_relate_consts(self, c, c),

‎compiler/rustc_infer/src/infer/error_reporting/need_type_info.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
247247
}
248248
}
249249
GenericArgKind::Const(ct) => {
250-
if let ty::ConstKind::Infer(InferConst::Var(vid)) = ct.val() {
250+
if let ty::ConstKind::Infer(InferConst::Var(vid)) = ct.kind() {
251251
let origin =
252252
self.inner.borrow_mut().const_unification_table().probe_value(vid).origin;
253253
if let ConstVariableOriginKind::ConstParameterDefinition(name, def_id) =
@@ -673,7 +673,7 @@ impl<'a, 'tcx> FindInferSourceVisitor<'a, 'tcx> {
673673
}
674674
(GenericArgKind::Const(inner_ct), GenericArgKind::Const(target_ct)) => {
675675
use ty::InferConst::*;
676-
match (inner_ct.val(), target_ct.val()) {
676+
match (inner_ct.kind(), target_ct.kind()) {
677677
(ty::ConstKind::Infer(Var(a_vid)), ty::ConstKind::Infer(Var(b_vid))) => self
678678
.infcx
679679
.inner
@@ -713,7 +713,7 @@ impl<'a, 'tcx> FindInferSourceVisitor<'a, 'tcx> {
713713
}
714714
}
715715
GenericArgKind::Const(ct) => {
716-
if matches!(ct.val(), ty::ConstKind::Unevaluated(..)) {
716+
if matches!(ct.kind(), ty::ConstKind::Unevaluated(..)) {
717717
// You can't write the generic arguments for
718718
// unevaluated constants.
719719
walker.skip_current_subtree();

‎compiler/rustc_infer/src/infer/freshen.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ impl<'a, 'tcx> TypeFolder<'tcx> for TypeFreshener<'a, 'tcx> {
218218
}
219219

220220
fn fold_const(&mut self, ct: ty::Const<'tcx>) -> ty::Const<'tcx> {
221-
match ct.val() {
221+
match ct.kind() {
222222
ty::ConstKind::Infer(ty::InferConst::Var(v)) => {
223223
let opt_ct = self
224224
.infcx

‎compiler/rustc_infer/src/infer/fudge.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl<'a, 'tcx> TypeFolder<'tcx> for InferenceFudger<'a, 'tcx> {
229229
}
230230

231231
fn fold_const(&mut self, ct: ty::Const<'tcx>) -> ty::Const<'tcx> {
232-
if let ty::ConstKind::Infer(ty::InferConst::Var(vid)) = ct.val() {
232+
if let ty::ConstKind::Infer(ty::InferConst::Var(vid)) = ct.kind() {
233233
if self.const_vars.0.contains(&vid) {
234234
// This variable was created during the fudging.
235235
// Recreate it with a fresh variable here.

‎compiler/rustc_infer/src/infer/higher_ranked/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
9999

100100
let fld_c = |bound_var: ty::BoundVar, ty| {
101101
self.tcx.mk_const(ty::ConstS {
102-
val: ty::ConstKind::Placeholder(ty::PlaceholderConst {
102+
kind: ty::ConstKind::Placeholder(ty::PlaceholderConst {
103103
universe: next_universe,
104104
name: ty::BoundConst { var: bound_var, ty },
105105
}),

‎compiler/rustc_infer/src/infer/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ impl<'tcx> TyOrConstInferVar<'tcx> {
17541754
/// Tries to extract an inference variable from a constant, returns `None`
17551755
/// for constants other than `ty::ConstKind::Infer(_)` (or `InferConst::Fresh`).
17561756
pub fn maybe_from_const(ct: ty::Const<'tcx>) -> Option<Self> {
1757-
match ct.val() {
1757+
match ct.kind() {
17581758
ty::ConstKind::Infer(InferConst::Var(v)) => Some(TyOrConstInferVar::Const(v)),
17591759
_ => None,
17601760
}
@@ -1833,7 +1833,7 @@ impl<'a, 'tcx> TypeFolder<'tcx> for ShallowResolver<'a, 'tcx> {
18331833
}
18341834

18351835
fn fold_const(&mut self, ct: ty::Const<'tcx>) -> ty::Const<'tcx> {
1836-
if let ty::ConstKind::Infer(InferConst::Var(vid)) = ct.val() {
1836+
if let ty::ConstKind::Infer(InferConst::Var(vid)) = ct.kind() {
18371837
self.infcx
18381838
.inner
18391839
.borrow_mut()

‎compiler/rustc_infer/src/infer/nll_relate/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ where
659659
b = self.infcx.shallow_resolve(b);
660660
}
661661

662-
match b.val() {
662+
match b.kind() {
663663
ty::ConstKind::Infer(InferConst::Var(_)) if D::forbid_inference_vars() => {
664664
// Forbid inference variables in the RHS.
665665
bug!("unexpected inference var {:?}", b)
@@ -1034,7 +1034,7 @@ where
10341034
a: ty::Const<'tcx>,
10351035
_: ty::Const<'tcx>,
10361036
) -> RelateResult<'tcx, ty::Const<'tcx>> {
1037-
match a.val() {
1037+
match a.kind() {
10381038
ty::ConstKind::Infer(InferConst::Var(_)) if D::forbid_inference_vars() => {
10391039
bug!("unexpected inference variable encountered in NLL generalization: {:?}", a);
10401040
}

‎compiler/rustc_infer/src/infer/resolve.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ impl<'a, 'tcx> FallibleTypeFolder<'tcx> for FullTypeResolver<'a, 'tcx> {
223223
Ok(c) // micro-optimize -- if there is nothing in this const that this fold affects...
224224
} else {
225225
let c = self.infcx.shallow_resolve(c);
226-
match c.val() {
226+
match c.kind() {
227227
ty::ConstKind::Infer(InferConst::Var(vid)) => {
228228
return Err(FixupError::UnresolvedConst(vid));
229229
}

‎compiler/rustc_lint/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2873,7 +2873,7 @@ impl ClashingExternDeclarations {
28732873
}
28742874
(Array(a_ty, a_const), Array(b_ty, b_const)) => {
28752875
// For arrays, we also check the constness of the type.
2876-
a_const.val() == b_const.val()
2876+
a_const.kind() == b_const.kind()
28772877
&& structurally_same_type_impl(seen_types, cx, *a_ty, *b_ty, ckind)
28782878
}
28792879
(Slice(a_ty), Slice(b_ty)) => {

‎compiler/rustc_middle/src/infer/canonical.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ impl<'tcx> CanonicalVarValues<'tcx> {
336336
GenericArgKind::Const(ct) => tcx
337337
.mk_const(ty::ConstS {
338338
ty: ct.ty(),
339-
val: ty::ConstKind::Bound(ty::INNERMOST, ty::BoundVar::from_u32(i)),
339+
kind: ty::ConstKind::Bound(ty::INNERMOST, ty::BoundVar::from_u32(i)),
340340
})
341341
.into(),
342342
})

0 commit comments

Comments
 (0)