From a0666954353d1e524d2bc0a76fed18507d0b7b07 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Sat, 10 Oct 2020 11:18:45 -0400
Subject: [PATCH] Fix miri imports for inclusion in libstd

---
 src/backtrace/miri.rs |  6 +++---
 src/symbolize/miri.rs | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/backtrace/miri.rs b/src/backtrace/miri.rs
index 88e2f299..2e3f1d0d 100644
--- 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
index b1bbbc70..8e2e1639 100644
--- 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(),
         ))
     }
 }