diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-07-14 20:57:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 20:57:18 -0700 |
| commit | 57bc82d637905457a2ae4869e21302d576209cb8 (patch) | |
| tree | de0f9fbedc9333419149094e02992f55ce0d3980 /src/libstd/sys | |
| parent | 877e62e471d9e8bcfbc1f8069d8d98e6a6c53e29 (diff) | |
| parent | 5757e0561975b40f81a739feb73abdc377eeda3a (diff) | |
| download | rust-57bc82d637905457a2ae4869e21302d576209cb8.tar.gz rust-57bc82d637905457a2ae4869e21302d576209cb8.zip | |
Rollup merge of #43228 - redox-os:backtrace_fix, r=alexcrichton
Fix backtrace on Redox This fixes sys::backtrace on Redox
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/redox/backtrace.rs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/libstd/sys/redox/backtrace.rs b/src/libstd/sys/redox/backtrace.rs index 961148fb6b4..6cafe3e69ba 100644 --- a/src/libstd/sys/redox/backtrace.rs +++ b/src/libstd/sys/redox/backtrace.rs @@ -8,16 +8,25 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use libc; use io; use sys_common::backtrace::Frame; -pub use sys_common::gnu::libbacktrace::*; +pub use sys_common::gnu::libbacktrace::{foreach_symbol_fileline, resolve_symname}; pub struct BacktraceContext; #[inline(never)] -pub fn unwind_backtrace(frames: &mut [Frame]) +pub fn unwind_backtrace(_frames: &mut [Frame]) -> io::Result<(usize, BacktraceContext)> { Ok((0, BacktraceContext)) } + +pub mod gnu { + use io; + use fs; + use libc::c_char; + + pub fn get_executable_filename() -> io::Result<(Vec<c_char>, fs::File)> { + Err(io::Error::new(io::ErrorKind::Other, "Not implemented")) + } +} |
