Skip to content

Commit 58433bf

Browse files
committed
fmt
1 parent 4481569 commit 58433bf

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/tools/miri/src/borrow_tracker/stacked_borrows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
996996

997997
/// Protect a place so that it cannot be used any more for the duration of the current function
998998
/// call.
999-
///
999+
///
10001000
/// This is used to ensure soundness of in-place function argument/return passing.
10011001
fn sb_protect_place(&mut self, place: &MPlaceTy<'tcx, Provenance>) -> InterpResult<'tcx> {
10021002
let this = self.eval_context_mut();

src/tools/miri/src/borrow_tracker/tree_borrows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
497497

498498
/// Protect a place so that it cannot be used any more for the duration of the current function
499499
/// call.
500-
///
500+
///
501501
/// This is used to ensure soundness of in-place function argument/return passing.
502502
fn tb_protect_place(&mut self, place: &MPlaceTy<'tcx, Provenance>) -> InterpResult<'tcx> {
503503
let this = self.eval_context_mut();

src/tools/miri/src/lib.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,20 @@
4343
// Needed for rustdoc from bootstrap (with `-Znormalize-docs`).
4444
#![recursion_limit = "256"]
4545

46+
extern crate either; // the one from rustc
47+
4648
extern crate rustc_apfloat;
4749
extern crate rustc_ast;
48-
extern crate rustc_errors;
49-
#[macro_use]
50-
extern crate rustc_middle;
5150
extern crate rustc_const_eval;
5251
extern crate rustc_data_structures;
52+
extern crate rustc_errors;
5353
extern crate rustc_hir;
5454
extern crate rustc_index;
55+
#[macro_use]
56+
extern crate rustc_middle;
5557
extern crate rustc_session;
5658
extern crate rustc_span;
5759
extern crate rustc_target;
58-
extern crate either; // the one from rustc
5960

6061
// Necessary to pull in object code as the rest of the rustc crates are shipped only as rmeta
6162
// files.

src/tools/miri/src/machine.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,9 +1097,8 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
10971097
ptr: Pointer<Self::Provenance>,
10981098
) -> InterpResult<'tcx> {
10991099
match ptr.provenance {
1100-
Provenance::Concrete { alloc_id, tag } => {
1101-
intptrcast::GlobalStateInner::expose_ptr(ecx, alloc_id, tag)
1102-
}
1100+
Provenance::Concrete { alloc_id, tag } =>
1101+
intptrcast::GlobalStateInner::expose_ptr(ecx, alloc_id, tag),
11031102
Provenance::Wildcard => {
11041103
// No need to do anything for wildcard pointers as
11051104
// their provenances have already been previously exposed.

0 commit comments

Comments
 (0)