fmt

Author: The Miri Conjob Bot

src/borrow_tracker/stacked_borrows/diagnostics.rs

@@ -5,9 +5,7 @@ use rustc_data_structures::fx::FxHashSet;
 use rustc_span::{Span, SpanData};
 use rustc_target::abi::Size;
 
-use crate::borrow_tracker::{
-    AccessKind, GlobalStateInner, ProtectorKind,
-};
+use crate::borrow_tracker::{AccessKind, GlobalStateInner, ProtectorKind};
 use crate::*;
 
 /// Error reporting

src/borrow_tracker/stacked_borrows/mod.rs

@@ -18,7 +18,8 @@ use rustc_target::abi::{Abi, Size};
 
 use crate::borrow_tracker::{
     stacked_borrows::diagnostics::{AllocHistory, DiagnosticCx, DiagnosticCxBuilder},
-    AccessKind, GlobalStateInner, ProtectorKind,};
+    AccessKind, GlobalStateInner, ProtectorKind,
+};
 use crate::*;
 
 use diagnostics::{RetagCause, RetagInfo};

src/borrow_tracker/tree_borrows/mod.rs

@@ -2,9 +2,7 @@ use log::trace;
 
 use rustc_target::abi::{Abi, Size};
 
-use crate::borrow_tracker::{
-    AccessKind, GlobalState, GlobalStateInner, ProtectorKind,
-};
+use crate::borrow_tracker::{AccessKind, GlobalState, GlobalStateInner, ProtectorKind};
 use rustc_middle::{
     mir::{Mutability, RetagKind},
     ty::{

tests/pass/enum-nullable-const-null-with-fields.rs

@@ -1,4 +1,3 @@
-
 static C: Result<(), Box<isize>> = Ok(());
 
 // This is because of yet another bad assertion (ICE) about the null side of a nullable enum.