Skip to content

Commit 1835604

Browse files
committed
Run fmt
1 parent fa5b936 commit 1835604

File tree

2 files changed

+16
-21
lines changed

2 files changed

+16
-21
lines changed

src/backtrace/miri.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use std::boxed::Box;
12
use std::ffi::c_void;
23
use std::string::String;
34
use std::vec::Vec;
4-
use std::boxed::Box;
55

66
extern "Rust" {
77
fn miri_get_backtrace(flags: u64) -> Box<[*mut ()]>;
@@ -10,7 +10,7 @@ extern "Rust" {
1010

1111
#[derive(Debug)]
1212
struct MiriData {
13-
frames: Vec<*mut c_void>
13+
frames: Vec<*mut c_void>,
1414
}
1515

1616
#[derive(Debug, Clone)]
@@ -24,7 +24,7 @@ pub struct MiriFrame {
2424
#[derive(Debug, Clone)]
2525
pub struct Frame {
2626
pub addr: *mut c_void,
27-
pub inner: MiriFrame
27+
pub inner: MiriFrame,
2828
}
2929

3030
// SAFETY: Miri guarantees that the returned pointer
@@ -56,21 +56,18 @@ pub fn trace<F: FnMut(&super::Frame) -> bool>(cb: F) {
5656
unsafe { trace_unsynchronized(cb) };
5757
}
5858

59-
6059
pub fn resolve_addr(ptr: *mut c_void) -> Frame {
6160
let frame: MiriFrame = unsafe { miri_resolve_frame(ptr as *mut (), 0) };
6261
Frame {
6362
addr: ptr,
64-
inner: frame
63+
inner: frame,
6564
}
6665
}
6766

6867
pub unsafe fn trace_unsynchronized<F: FnMut(&super::Frame) -> bool>(mut cb: F) {
6968
let frames = miri_get_backtrace(0);
7069
for ptr in frames.iter() {
7170
let frame = resolve_addr(*ptr as *mut c_void);
72-
cb(&super::Frame {
73-
inner: frame
74-
});
71+
cb(&super::Frame { inner: frame });
7572
}
7673
}

src/symbolize/miri.rs

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
1-
use core::marker::PhantomData;
21
use core::ffi::c_void;
2+
use core::marker::PhantomData;
33

4-
use crate::symbolize::{ResolveWhat, SymbolName};
54
use crate::backtrace::miri::{resolve_addr, Frame};
5+
use crate::symbolize::{ResolveWhat, SymbolName};
66
use crate::types::BytesOrWideString;
77

8-
98
pub unsafe fn resolve(what: ResolveWhat, cb: &mut FnMut(&super::Symbol)) {
109
let sym = match what {
1110
ResolveWhat::Address(addr) => Symbol {
1211
inner: resolve_addr(addr),
13-
_unused: PhantomData
12+
_unused: PhantomData,
13+
},
14+
ResolveWhat::Frame(frame) => Symbol {
15+
inner: frame.inner.clone(),
16+
_unused: PhantomData,
1417
},
15-
ResolveWhat::Frame(frame) => {
16-
Symbol {
17-
inner: frame.inner.clone(),
18-
_unused: PhantomData
19-
}
20-
}
2118
};
2219
cb(&super::Symbol { inner: sym })
2320
}
2421

25-
2622
pub struct Symbol<'a> {
2723
inner: Frame,
28-
_unused: PhantomData<&'a ()>
24+
_unused: PhantomData<&'a ()>,
2925
}
3026

3127
impl<'a> Symbol<'a> {
@@ -51,6 +47,8 @@ impl<'a> Symbol<'a> {
5147

5248
pub fn filename(&self) -> Option<&::std::path::Path> {
5349
use std::path::Path;
54-
Some(Path::new(std::str::from_utf8(&self.inner.inner.filename).unwrap()))
50+
Some(Path::new(
51+
std::str::from_utf8(&self.inner.inner.filename).unwrap(),
52+
))
5553
}
5654
}

0 commit comments

Comments
 (0)