fmt

Author: RalfJung

src/intptrcast.rs

@@ -94,7 +94,7 @@ impl<'mir, 'tcx> GlobalStateInner {
         if global_state.exposed.contains(&alloc_id) {
             // FIXME: this catches `InterpError`, which we should not usually do.
             // We might need a proper fallible API from `memory.rs` to avoid this though.
-            if let Ok(_) = ecx.get_alloc_size_and_align(alloc_id, AllocCheck::Live) {
+            if ecx.get_alloc_size_and_align(alloc_id, AllocCheck::Live).is_ok() {
                 return Some(alloc_id);
             }
         }

src/lib.rs

@@ -89,8 +89,8 @@ pub use crate::mono_hash_map::MonoHashMap;
 pub use crate::operator::EvalContextExt as OperatorEvalContextExt;
 pub use crate::range_map::RangeMap;
 pub use crate::stacked_borrows::{
-    CallId, EvalContextExt as StackedBorEvalContextExt, Item, Permission, SbTag, SbTagExtra,
-    Stack, Stacks,
+    CallId, EvalContextExt as StackedBorEvalContextExt, Item, Permission, SbTag, SbTagExtra, Stack,
+    Stacks,
 };
 pub use crate::sync::{CondvarId, EvalContextExt as SyncEvalContextExt, MutexId, RwLockId};
 pub use crate::thread::{

src/stacked_borrows.rs

@@ -403,12 +403,7 @@ impl<'tcx> Stack {
                             tag, item
                         ),
                         None,
-                        tag.and_then(|tag| {
-                            alloc_history.get_logs_relevant_to(
-                                tag,
-                                Some(item.tag),
-                            )
-                        }),
+                        tag.and_then(|tag| alloc_history.get_logs_relevant_to(tag, Some(item.tag))),
                     ))?
                 } else {
                     Err(err_sb_ub(

src/stacked_borrows/diagnostics.rs

@@ -148,9 +148,7 @@ impl AllocHistory {
         err_sb_ub(
             format!("{}{}", action, error_cause(stack, derived_from)),
             Some(operation_summary("a reborrow", alloc_id, alloc_range)),
-            derived_from.and_then(|derived_from| {
-                self.get_logs_relevant_to(derived_from, None)
-            }),
+            derived_from.and_then(|derived_from| self.get_logs_relevant_to(derived_from, None)),
         )
     }