From dd69890ef1fde0774428ca7d49a5381ce17b36bb Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 26 Jun 2022 22:27:38 -0400 Subject: [PATCH] fmt --- src/lib.rs | 4 ++-- src/stacked_borrows.rs | 7 +------ src/stacked_borrows/diagnostics.rs | 4 +--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 1633667fca..621af171f4 100644 --- a/src/lib.rs +++ b/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::{ diff --git a/src/stacked_borrows.rs b/src/stacked_borrows.rs index e79116a28e..ea1132d3e1 100644 --- a/src/stacked_borrows.rs +++ b/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( diff --git a/src/stacked_borrows/diagnostics.rs b/src/stacked_borrows/diagnostics.rs index 0a7edcdc89..b1ff864bcd 100644 --- a/src/stacked_borrows/diagnostics.rs +++ b/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)), ) }