move platform specific backtrace into ./platform

Signed-off-by: Christian Jordan <[email protected]>

Author: Jardynq

src/backtrace/mod.rs renamed to src/backtrace.rs

@@ -3,6 +3,8 @@
 use libc::c_void;
 use std::path::PathBuf;
 
+pub use crate::platform::TraceImpl;
+
 pub trait Symbol: Sized {
     fn name(&self) -> Option<Vec<u8>>;
     fn addr(&self) -> Option<*mut c_void>;
@@ -43,25 +45,3 @@ pub trait Trace {
     where
         Self: Sized;
 }
-
-#[cfg(not(all(
-    any(target_arch = "x86_64", target_arch = "aarch64"),
-    feature = "frame-pointer"
-)))]
-mod backtrace_rs;
-#[cfg(not(all(
-    any(target_arch = "x86_64", target_arch = "aarch64"),
-    feature = "frame-pointer"
-)))]
-pub use backtrace_rs::Trace as TraceImpl;
-
-#[cfg(all(
-    any(target_arch = "x86_64", target_arch = "aarch64"),
-    feature = "frame-pointer"
-))]
-pub mod frame_pointer;
-#[cfg(all(
-    any(target_arch = "x86_64", target_arch = "aarch64"),
-    feature = "frame-pointer"
-))]
-pub use frame_pointer::Trace as TraceImpl;

src/backtrace/backtrace_rs.rs renamed to src/platform/backtrace_rs.rs

@@ -1,4 +1,4 @@
-impl super::Frame for backtrace::Frame {
+impl crate::backtrace::Frame for backtrace::Frame {
     type S = backtrace::Symbol;
 
     fn ip(&self) -> usize {
@@ -16,7 +16,7 @@ impl super::Frame for backtrace::Frame {
 
 pub struct Trace {}
 
-impl super::Trace for Trace {
+impl crate::backtrace::Trace for Trace {
     type Frame = backtrace::Frame;
 
     fn trace<F: FnMut(&Self::Frame) -> bool>(_: *mut libc::c_void, cb: F) {

src/platform/mod.rs

@@ -3,13 +3,43 @@ mod nix_impl {
     pub mod addr_validate;
     pub mod profiler;
     pub mod timer;
+
+    #[cfg(all(
+        any(target_arch = "x86_64", target_arch = "aarch64"),
+        feature = "frame-pointer",
+    ))]
+    mod frame_pointer;
+    #[cfg(all(
+        any(target_arch = "x86_64", target_arch = "aarch64"),
+        feature = "frame-pointer",
+    ))]
+    pub use frame_pointer::Trace as TraceImpl;
+
+    #[cfg(not(all(
+        any(target_arch = "x86_64", target_arch = "aarch64"),
+        feature = "frame-pointer",
+    )))]
+    #[path = "../backtrace_rs.rs"]
+    mod backtrace_rs;
+    #[cfg(not(all(
+        any(target_arch = "x86_64", target_arch = "aarch64"),
+        feature = "frame-pointer",
+    )))]
+    pub use backtrace_rs::Trace as TraceImpl;
 }
 
 #[cfg(target_os = "windows")]
 mod windows_impl {
     pub mod addr_validate;
     pub mod profiler;
     pub mod timer;
+
+    #[cfg(feature = "frame-pointer")]
+    std::compile_error!("frame-pointer feature is currently not supported on windows.");
+
+    #[path = "../backtrace_rs.rs"]
+    mod backtrace_rs;
+    pub use backtrace_rs::Trace as TraceImpl;
 }
 
 #[cfg(any(target_os = "linux", target_os = "macos"))]

src/backtrace/frame_pointer.rs renamed to src/platform/nix_impl/frame_pointer.rs

@@ -4,7 +4,7 @@ use std::ptr::null_mut;
 
 use libc::c_void;
 
-use crate::addr_validate::validate;
+use crate::validate;
 
 #[derive(Clone, Debug)]
 pub struct Frame {
@@ -16,7 +16,7 @@ extern "C" {
 
 }
 
-impl super::Frame for Frame {
+impl crate::backtrace::Frame for Frame {
     type S = backtrace::Symbol;
 
     fn ip(&self) -> usize {
@@ -37,7 +37,7 @@ impl super::Frame for Frame {
 }
 
 pub struct Trace {}
-impl super::Trace for Trace {
+impl crate::backtrace::Trace for Trace {
     type Frame = Frame;
 
     fn trace<F: FnMut(&Self::Frame) -> bool>(ucontext: *mut libc::c_void, mut cb: F) {