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 3cf924b

Browse files
committedJun 15, 2024
Auto merge of rust-lang#126528 - GuillaumeGomez:rollup-6zjs70e, r=GuillaumeGomez
Rollup of 9 pull requests Successful merges: - rust-lang#126229 (Bump windows-bindgen to 0.57) - rust-lang#126404 (Check that alias-relate terms are WF if reporting an error in alias-relate) - rust-lang#126410 (smir: merge identical Constant and ConstOperand types) - rust-lang#126478 (Migrate `run-make/codegen-options-parsing` to `rmake.rs`) - rust-lang#126496 (Make proof tree probing and `Candidate`/`CandidateSource` generic over interner) - rust-lang#126508 (Make uninitialized_error_reported a set of locals) - rust-lang#126517 (Migrate `run-make/dep-graph` to `rmake.rs`) - rust-lang#126525 (trait_selection: remove extra words) - rust-lang#126526 (tests/ui/lint: Move 19 tests to new `non-snake-case` subdir) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 92af831 + f788ea4 commit 3cf924b

File tree

78 files changed

+424
-850
lines changed

Some content is hidden

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

78 files changed

+424
-850
lines changed
 

‎compiler/rustc_smir/src/rustc_smir/builder.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ impl<'tcx> BodyBuilder<'tcx> {
5252
}
5353

5454
impl<'tcx> MutVisitor<'tcx> for BodyBuilder<'tcx> {
55-
fn visit_constant(&mut self, constant: &mut mir::ConstOperand<'tcx>, location: mir::Location) {
55+
fn visit_const_operand(
56+
&mut self,
57+
constant: &mut mir::ConstOperand<'tcx>,
58+
location: mir::Location,
59+
) {
5660
let const_ = constant.const_;
5761
let val = match const_.eval(self.tcx, ty::ParamEnv::reveal_all(), constant.span) {
5862
Ok(v) => v,
@@ -63,7 +67,7 @@ impl<'tcx> MutVisitor<'tcx> for BodyBuilder<'tcx> {
6367
};
6468
let ty = constant.ty();
6569
constant.const_ = mir::Const::Val(val, ty);
66-
self.super_constant(constant, location);
70+
self.super_const_operand(constant, location);
6771
}
6872

6973
fn tcx(&self) -> TyCtxt<'tcx> {

‎compiler/rustc_smir/src/rustc_smir/convert/mir.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -328,13 +328,13 @@ impl<'tcx> Stable<'tcx> for mir::Operand<'tcx> {
328328
}
329329

330330
impl<'tcx> Stable<'tcx> for mir::ConstOperand<'tcx> {
331-
type T = stable_mir::mir::Constant;
331+
type T = stable_mir::mir::ConstOperand;
332332

333333
fn stable(&self, tables: &mut Tables<'_>) -> Self::T {
334-
stable_mir::mir::Constant {
334+
stable_mir::mir::ConstOperand {
335335
span: self.span.stable(tables),
336336
user_ty: self.user_ty.map(|u| u.as_usize()).or(None),
337-
literal: self.const_.stable(tables),
337+
const_: self.const_.stable(tables),
338338
}
339339
}
340340
}
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.