diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2024-10-20 05:04:32 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2024-10-20 05:04:32 +0000 |
| commit | ccd680ee01564d32cad783a94c4dcccf228922c1 (patch) | |
| tree | 7aebdb581d6b5aa4a67efc5c52d84cc0bf58e802 | |
| parent | 19b0bb9b5433c32591383d5e9bbce8a8475886a7 (diff) | |
| download | rust-ccd680ee01564d32cad783a94c4dcccf228922c1.tar.gz rust-ccd680ee01564d32cad783a94c4dcccf228922c1.zip | |
fmt
| -rw-r--r-- | src/tools/miri/src/borrow_tracker/stacked_borrows/diagnostics.rs | 6 | ||||
| -rw-r--r-- | src/tools/miri/tests/pass/dyn-upcast.rs | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/miri/src/borrow_tracker/stacked_borrows/diagnostics.rs b/src/tools/miri/src/borrow_tracker/stacked_borrows/diagnostics.rs index 1684abeec6b..5624c4c479e 100644 --- a/src/tools/miri/src/borrow_tracker/stacked_borrows/diagnostics.rs +++ b/src/tools/miri/src/borrow_tracker/stacked_borrows/diagnostics.rs @@ -424,7 +424,11 @@ impl<'history, 'ecx, 'tcx> DiagnosticCx<'history, 'ecx, 'tcx> { } #[inline(never)] // This is only called on fatal code paths - pub(super) fn protector_error(&self, item: &Item, kind: ProtectorKind) -> InterpErrorKind<'tcx> { + pub(super) fn protector_error( + &self, + item: &Item, + kind: ProtectorKind, + ) -> InterpErrorKind<'tcx> { let protected = match kind { ProtectorKind::WeakProtector => "weakly protected", ProtectorKind::StrongProtector => "strongly protected", diff --git a/src/tools/miri/tests/pass/dyn-upcast.rs b/src/tools/miri/tests/pass/dyn-upcast.rs index 306e9ab9c67..61410f7c4e0 100644 --- a/src/tools/miri/tests/pass/dyn-upcast.rs +++ b/src/tools/miri/tests/pass/dyn-upcast.rs @@ -433,7 +433,8 @@ fn replace_vptr() { } fn drop_principal() { - use std::{alloc::Layout, any::Any}; + use std::alloc::Layout; + use std::any::Any; const fn yeet_principal(x: Box<dyn Any + Send>) -> Box<dyn Send> { x |
