diff options
| -rw-r--r-- | compiler/rustc_middle/src/mir/mod.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_mir_transform/src/add_retag.rs | 4 | ||||
| -rw-r--r-- | src/test/run-make/const_fn_mir/dump.mir | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/compiler/rustc_middle/src/mir/mod.rs b/compiler/rustc_middle/src/mir/mod.rs index e042e57acf1..42a205fad75 100644 --- a/compiler/rustc_middle/src/mir/mod.rs +++ b/compiler/rustc_middle/src/mir/mod.rs @@ -1180,10 +1180,6 @@ impl<'tcx> LocalDecl<'tcx> { } } - pub fn temp(mut self) { - self.local_info = Some(Box::new(LocalInfo::Temp)); - } - /// Converts `self` into same `LocalDecl` except tagged as internal. #[inline] pub fn internal(mut self) -> Self { diff --git a/compiler/rustc_mir_transform/src/add_retag.rs b/compiler/rustc_mir_transform/src/add_retag.rs index ff4cd477326..825340892d9 100644 --- a/compiler/rustc_mir_transform/src/add_retag.rs +++ b/compiler/rustc_mir_transform/src/add_retag.rs @@ -59,8 +59,8 @@ fn may_be_reference(ty: Ty<'_>) -> bool { /// Determines whether or not this LocalDecl is temp, if not it needs retagging. fn is_not_temp<'tcx>(local_decl: &LocalDecl<'tcx>) -> bool { - if local_decl.local_info.is_some() { - match local_decl.local_info.as_ref().unwrap().as_ref() { + if let Some(local_info) = &local_decl.local_info { + match local_info.as_ref() { LocalInfo::Temp => return false, _ => (), }; diff --git a/src/test/run-make/const_fn_mir/dump.mir b/src/test/run-make/const_fn_mir/dump.mir index 4e8936905c4..f02bccc4b2d 100644 --- a/src/test/run-make/const_fn_mir/dump.mir +++ b/src/test/run-make/const_fn_mir/dump.mir @@ -23,10 +23,6 @@ fn foo() -> i32 { _0 = move (_1.0: i32); // scope 0 at main.rs:5:5: 5:10 return; // scope 0 at main.rs:6:2: 6:2 } - - bb2 (cleanup): { - resume; // scope 0 at main.rs:4:1: 6:2 - } } fn main() -> () { |