Skip to content

Commit 893fbb2

Browse files
authored
Fix miri imports for inclusion in libstd (#375)
1 parent fbab40c commit 893fbb2

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/backtrace/miri.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use std::boxed::Box;
2-
use std::ffi::c_void;
1+
use alloc::boxed::Box;
2+
use core::ffi::c_void;
33

44
extern "Rust" {
55
fn miri_get_backtrace(flags: u64) -> Box<[*mut ()]>;
@@ -32,7 +32,7 @@ impl Frame {
3232
}
3333

3434
pub fn sp(&self) -> *mut c_void {
35-
std::ptr::null_mut()
35+
core::ptr::null_mut()
3636
}
3737

3838
pub fn symbol_address(&self) -> *mut c_void {

src/symbolize/miri.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use core::ffi::c_void;
22
use core::marker::PhantomData;
33

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

88
pub unsafe fn resolve(what: ResolveWhat<'_>, cb: &mut dyn FnMut(&super::Symbol)) {
99
let sym = match what {
@@ -45,10 +45,10 @@ impl<'a> Symbol<'a> {
4545
Some(self.inner.inner.colno)
4646
}
4747

48-
pub fn filename(&self) -> Option<&::std::path::Path> {
49-
use std::path::Path;
50-
Some(Path::new(
51-
std::str::from_utf8(&self.inner.inner.filename).unwrap(),
48+
#[cfg(feature = "std")]
49+
pub fn filename(&self) -> Option<&std::path::Path> {
50+
Some(std::path::Path::new(
51+
core::str::from_utf8(&self.inner.inner.filename).unwrap(),
5252
))
5353
}
5454
}

0 commit comments

Comments
 (0)