diff options
| author | Michael Howell <michael@notriddle.com> | 2022-09-20 10:13:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-20 10:13:01 -0700 |
| commit | b149c481868a3efe10db36679a177cd2ede9d08a (patch) | |
| tree | d0cac3f6a8cdefb992b5c116c713978b4910f3ed /compiler/rustc_mir_transform/src | |
| parent | 08b369a501d5981ecbb57d5f5f1f3bb4d34f081b (diff) | |
| parent | c54c5a3c77796e5194dd0369e9ffdbf41bf3c5d8 (diff) | |
| download | rust-b149c481868a3efe10db36679a177cd2ede9d08a.tar.gz rust-b149c481868a3efe10db36679a177cd2ede9d08a.zip | |
Rollup merge of #102021 - lcnr:tyConst-fun, r=b-naber,BoxyUwU
some post-valtree cleanup r? project-const-generics cc ```@b-naber```
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/const_prop.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_mir_transform/src/const_prop_lint.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/const_prop.rs b/compiler/rustc_mir_transform/src/const_prop.rs index 08ba3f9941d..cb134a20ea0 100644 --- a/compiler/rustc_mir_transform/src/const_prop.rs +++ b/compiler/rustc_mir_transform/src/const_prop.rs @@ -471,7 +471,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> { return None; } - self.ecx.mir_const_to_op(&c.literal, None).ok() + self.ecx.const_to_op(&c.literal, None).ok() } /// Returns the value, if any, of evaluating `place`. diff --git a/compiler/rustc_mir_transform/src/const_prop_lint.rs b/compiler/rustc_mir_transform/src/const_prop_lint.rs index f16efb365f3..2885f06b19c 100644 --- a/compiler/rustc_mir_transform/src/const_prop_lint.rs +++ b/compiler/rustc_mir_transform/src/const_prop_lint.rs @@ -292,7 +292,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> { return None; } - match self.ecx.mir_const_to_op(&c.literal, None) { + match self.ecx.const_to_op(&c.literal, None) { Ok(op) => Some(op), Err(error) => { let tcx = self.ecx.tcx.at(c.span); |