Skip to content

Commit 76600be

Browse files
author
The Miri Cronjob Bot
committed
fmt
1 parent 4c8e867 commit 76600be

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/borrow_tracker/stacked_borrows/diagnostics.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,11 @@ impl<'history, 'ecx, 'tcx> DiagnosticCx<'history, 'ecx, 'tcx> {
424424
}
425425

426426
#[inline(never)] // This is only called on fatal code paths
427-
pub(super) fn protector_error(&self, item: &Item, kind: ProtectorKind) -> InterpErrorKind<'tcx> {
427+
pub(super) fn protector_error(
428+
&self,
429+
item: &Item,
430+
kind: ProtectorKind,
431+
) -> InterpErrorKind<'tcx> {
428432
let protected = match kind {
429433
ProtectorKind::WeakProtector => "weakly protected",
430434
ProtectorKind::StrongProtector => "strongly protected",

tests/pass/dyn-upcast.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,8 @@ fn replace_vptr() {
433433
}
434434

435435
fn drop_principal() {
436-
use std::{alloc::Layout, any::Any};
436+
use std::alloc::Layout;
437+
use std::any::Any;
437438

438439
const fn yeet_principal(x: Box<dyn Any + Send>) -> Box<dyn Send> {
439440
x

0 commit comments

Comments
 (0)