Skip to content

Commit 8dc52b3

Browse files
author
The Miri Cronjob Bot
committed
fmt
1 parent ef516ab commit 8dc52b3

File tree

13 files changed

+19
-16
lines changed

13 files changed

+19
-16
lines changed

src/intrinsics/atomic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_middle::{mir, mir::BinOp, ty};
22

3-
use crate::*;
43
use self::helpers::check_arg_count;
4+
use crate::*;
55

66
pub enum AtomicOp {
77
/// The `bool` indicates whether the result of the operation should be negated (`UnOp::Not`,

src/intrinsics/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ use rustc_middle::{
1212
use rustc_span::{Symbol, sym};
1313
use rustc_target::abi::Size;
1414

15-
use crate::*;
1615
use self::atomic::EvalContextExt as _;
1716
use self::helpers::{ToHost, ToSoft, check_arg_count};
1817
use self::simd::EvalContextExt as _;
18+
use crate::*;
1919

2020
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
2121
pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {

src/shims/env.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::ffi::{OsStr, OsString};
22

33
use rustc_data_structures::fx::FxHashMap;
44

5-
use crate::*;
65
use self::shims::{unix::UnixEnvVars, windows::WindowsEnvVars};
6+
use crate::*;
77

88
#[derive(Default)]
99
pub enum EnvVars<'tcx> {

src/shims/foreign_items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ use rustc_target::{
1212
spec::abi::Abi,
1313
};
1414

15+
use self::helpers::{ToHost, ToSoft};
1516
use super::alloc::EvalContextExt as _;
1617
use super::backtrace::EvalContextExt as _;
1718
use crate::*;
18-
use self::helpers::{ToHost, ToSoft};
1919

2020
/// Type of dynamic symbols (for `dlsym` et al)
2121
#[derive(Debug, Copy, Clone)]

src/shims/panic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ use rustc_middle::{mir, ty};
1616
use rustc_target::spec::PanicStrategy;
1717
use rustc_target::spec::abi::Abi;
1818

19-
use crate::*;
2019
use self::helpers::check_arg_count;
20+
use crate::*;
2121

2222
/// Holds all of the relevant data for when unwinding hits a `try` frame.
2323
#[derive(Debug)]

src/shims/unix/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ use std::time::SystemTime;
1111
use rustc_data_structures::fx::FxHashMap;
1212
use rustc_target::abi::Size;
1313

14+
use self::shims::time::system_time_to_duration;
1415
use crate::shims::os_str::bytes_to_os_str;
1516
use crate::shims::unix::fd::FileDescriptionRef;
1617
use crate::shims::unix::*;
1718
use crate::*;
18-
use self::shims::time::system_time_to_duration;
1919

2020
use self::fd::FlockOp;
2121

src/shims/unix/linux/foreign_items.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
use rustc_span::Symbol;
22
use rustc_target::spec::abi::Abi;
33

4-
use crate::machine::SIGRTMAX;
5-
use crate::machine::SIGRTMIN;
6-
use crate::shims::unix::*;
7-
use crate::*;
84
use self::shims::unix::linux::epoll::EvalContextExt as _;
95
use self::shims::unix::linux::eventfd::EvalContextExt as _;
106
use self::shims::unix::linux::mem::EvalContextExt as _;
117
use self::shims::unix::linux::sync::futex;
8+
use crate::machine::SIGRTMAX;
9+
use crate::machine::SIGRTMIN;
10+
use crate::shims::unix::*;
11+
use crate::*;
1212

1313
pub fn is_dyn_sym(name: &str) -> bool {
1414
matches!(name, "statx")

src/shims/unix/macos/foreign_items.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
8080

8181
// Random data generation
8282
"CCRandomGenerateBytes" => {
83-
let [bytes, count] = this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;
83+
let [bytes, count] =
84+
this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;
8485
let bytes = this.read_pointer(bytes)?;
8586
let count = this.read_target_usize(count)?;
8687
let success = this.eval_libc_i32("kCCSuccess");

src/shims/windows/env.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use std::io::ErrorKind;
44

55
use rustc_data_structures::fx::FxHashMap;
66

7-
use crate::*;
87
use self::helpers::windows_check_buffer_size;
8+
use crate::*;
99

1010
#[derive(Default)]
1111
pub struct WindowsEnvVars {

src/shims/windows/foreign_items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ use rustc_span::Symbol;
88
use rustc_target::abi::{Align, Size};
99
use rustc_target::spec::abi::Abi;
1010

11+
use self::shims::windows::handle::{Handle, PseudoHandle};
1112
use crate::shims::os_str::bytes_to_os_str;
1213
use crate::shims::windows::*;
1314
use crate::*;
14-
use self::shims::windows::handle::{Handle, PseudoHandle};
1515

1616
pub fn is_dyn_sym(name: &str) -> bool {
1717
// std does dynamic detection for these symbols

src/shims/windows/thread.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use rustc_middle::ty::layout::LayoutOf;
22
use rustc_target::spec::abi::Abi;
33

4-
use crate::*;
54
use self::shims::windows::handle::{EvalContextExt as _, Handle, PseudoHandle};
5+
use crate::*;
66

77
impl<'tcx> EvalContextExt<'tcx> for crate::MiriInterpCx<'tcx> {}
88

src/shims/x86/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use rustc_span::Symbol;
88
use rustc_target::abi::Size;
99
use rustc_target::spec::abi::Abi;
1010

11-
use crate::*;
1211
use self::helpers::bool_to_simd_element;
12+
use crate::*;
1313

1414
mod aesni;
1515
mod avx;

tests/fail/validity/wrong-dyn-trait-assoc-type.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ trait Trait {
55

66
impl<T: Copy> Trait for T {
77
type Assoc = T;
8-
fn foo(&self) -> T { *self }
8+
fn foo(&self) -> T {
9+
*self
10+
}
911
}
1012

1113
fn main() {

0 commit comments

Comments
 (0)