Fix miri imports for inclusion in libstd

Aaron1011 · Oct 11, 2020 · a066695 · a066695
1 parent 8eee2e4
commit a066695
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/backtrace/miri.rs b/src/backtrace/miri.rs
@@ -1,5 +1,5 @@
-use std::boxed::Box;
-use std::ffi::c_void;
+use alloc::boxed::Box;
+use core::ffi::c_void;
 
 extern "Rust" {
     fn miri_get_backtrace(flags: u64) -> Box<[*mut ()]>;
@@ -32,7 +32,7 @@ impl Frame {
     }
 
     pub fn sp(&self) -> *mut c_void {
-        std::ptr::null_mut()
+        core::ptr::null_mut()
     }
 
     pub fn symbol_address(&self) -> *mut c_void {

diff --git a/src/symbolize/miri.rs b/src/symbolize/miri.rs
@@ -1,9 +1,9 @@
 use core::ffi::c_void;
 use core::marker::PhantomData;
 
-use crate::backtrace::miri::{resolve_addr, Frame};
-use crate::symbolize::{ResolveWhat, SymbolName};
-use crate::types::BytesOrWideString;
+use super::super::backtrace::miri::{resolve_addr, Frame};
+use super::BytesOrWideString;
+use super::{ResolveWhat, SymbolName};
 
 pub unsafe fn resolve(what: ResolveWhat<'_>, cb: &mut dyn FnMut(&super::Symbol)) {
     let sym = match what {
@@ -45,10 +45,10 @@ impl<'a> Symbol<'a> {
         Some(self.inner.inner.colno)
     }
 
-    pub fn filename(&self) -> Option<&::std::path::Path> {
-        use std::path::Path;
-        Some(Path::new(
-            std::str::from_utf8(&self.inner.inner.filename).unwrap(),
+    #[cfg(feature = "std")]
+    pub fn filename(&self) -> Option<&std::path::Path> {
+        Some(std::path::Path::new(
+            core::str::from_utf8(&self.inner.inner.filename).unwrap(),
         ))
     }
 }