diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-11-01 13:04:03 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-11-09 07:56:44 -0800 |
| commit | 5c3fe111d4a6e72f0461320f5166bcd6aaf2f37f (patch) | |
| tree | 48f0b9a3b4a7d115bd9bf29916adc437fed669fd /src/libstd/sys_common/backtrace.rs | |
| parent | 348930eb4e75ee9ce42e783fe9942c8eb5165bc1 (diff) | |
| download | rust-5c3fe111d4a6e72f0461320f5166bcd6aaf2f37f.tar.gz rust-5c3fe111d4a6e72f0461320f5166bcd6aaf2f37f.zip | |
std: Avoid use of `libc` in portable modules
This commit removes usage of the `libc` crate in "portable" modules like those at the top level and `sys_common`. Instead common types like `*mut u8` or `u32` are used instead of `*mut c_void` or `c_int` as well as switching to platform-specific functions like `sys::strlen` instead of `libc::strlen`.
Diffstat (limited to 'src/libstd/sys_common/backtrace.rs')
| -rw-r--r-- | src/libstd/sys_common/backtrace.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs index 8f78c2e6f59..9f0214f5f05 100644 --- a/src/libstd/sys_common/backtrace.rs +++ b/src/libstd/sys_common/backtrace.rs @@ -14,7 +14,6 @@ use env; use io::prelude::*; use io; -use libc; use str; use sync::atomic::{self, Ordering}; use path::{self, Path}; @@ -39,9 +38,9 @@ pub const HEX_WIDTH: usize = 10; #[derive(Debug, Copy, Clone)] pub struct Frame { /// Exact address of the call that failed. - pub exact_position: *const libc::c_void, + pub exact_position: *const u8, /// Address of the enclosing function. - pub symbol_addr: *const libc::c_void, + pub symbol_addr: *const u8, } /// Max number of frames to print. @@ -201,8 +200,10 @@ fn output(w: &mut Write, idx: usize, frame: Frame, /// /// See also `output`. #[allow(dead_code)] -fn output_fileline(w: &mut Write, file: &[u8], line: libc::c_int, - format: PrintFormat) -> io::Result<()> { +fn output_fileline(w: &mut Write, + file: &[u8], + line: u32, + format: PrintFormat) -> io::Result<()> { // prior line: " ##: {:2$} - func" w.write_all(b"")?; match format { |
