Skip to content

Commit edab34a

Browse files
committedJun 14, 2022
Auto merge of #98091 - Dylan-DPC:rollup-ueb6b5x, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #97869 (BTree: tweak internal comments) - #97935 (Rename the `ConstS::val` field as `kind`.) - #97948 (lint: add diagnostic translation migration lints) - #98042 (Fix compat_fn option method on miri) - #98069 (rustdoc: remove link on slice brackets) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents da895e7 + 27f7805 commit edab34a

File tree

96 files changed

+522
-250
lines changed

Some content is hidden

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

96 files changed

+522
-250
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 {

0 commit comments

Comments
 (0)
Please sign in to comment.