9191// `Backtrace`, but that's a relatively small price to pay relative to capturing
9292// a backtrace or actually symbolizing it.
9393
94- use crate :: backtrace_rs:: { self , BytesOrWideString } ;
9594use crate :: env;
9695use crate :: ffi:: c_void;
9796use crate :: fmt;
9897use crate :: sync:: atomic:: { AtomicUsize , Ordering :: SeqCst } ;
9998use crate :: sync:: Mutex ;
10099use crate :: sys_common:: backtrace:: { lock, output_filename} ;
101100use crate :: vec:: Vec ;
101+ use backtrace:: BytesOrWideString ;
102+ use backtrace_rs as backtrace;
102103
103104/// A captured OS thread stack backtrace.
104105///
@@ -149,7 +150,7 @@ struct BacktraceFrame {
149150}
150151
151152enum RawFrame {
152- Actual ( backtrace_rs :: Frame ) ,
153+ Actual ( backtrace :: Frame ) ,
153154 #[ cfg( test) ]
154155 Fake ,
155156}
@@ -196,7 +197,7 @@ impl fmt::Debug for BacktraceSymbol {
196197 fn fmt ( & self , fmt : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
197198 write ! ( fmt, "{{ " ) ?;
198199
199- if let Some ( fn_name) = self . name . as_ref ( ) . map ( |b| backtrace_rs :: SymbolName :: new ( b) ) {
200+ if let Some ( fn_name) = self . name . as_ref ( ) . map ( |b| backtrace :: SymbolName :: new ( b) ) {
200201 write ! ( fmt, "fn: \" {:#}\" " , fn_name) ?;
201202 } else {
202203 write ! ( fmt, "fn: <unknown>" ) ?;
@@ -222,7 +223,7 @@ impl fmt::Debug for BytesOrWide {
222223 BytesOrWide :: Bytes ( w) => BytesOrWideString :: Bytes ( w) ,
223224 BytesOrWide :: Wide ( w) => BytesOrWideString :: Wide ( w) ,
224225 } ,
225- backtrace_rs :: PrintFmt :: Short ,
226+ backtrace :: PrintFmt :: Short ,
226227 crate :: env:: current_dir ( ) . as_ref ( ) . ok ( ) ,
227228 )
228229 }
@@ -298,7 +299,7 @@ impl Backtrace {
298299 let mut frames = Vec :: new ( ) ;
299300 let mut actual_start = None ;
300301 unsafe {
301- backtrace_rs :: trace_unsynchronized ( |frame| {
302+ backtrace :: trace_unsynchronized ( |frame| {
302303 frames. push ( BacktraceFrame {
303304 frame : RawFrame :: Actual ( frame. clone ( ) ) ,
304305 symbols : Vec :: new ( ) ,
@@ -349,9 +350,9 @@ impl fmt::Display for Backtrace {
349350
350351 let full = fmt. alternate ( ) ;
351352 let ( frames, style) = if full {
352- ( & capture. frames [ ..] , backtrace_rs :: PrintFmt :: Full )
353+ ( & capture. frames [ ..] , backtrace :: PrintFmt :: Full )
353354 } else {
354- ( & capture. frames [ capture. actual_start ..] , backtrace_rs :: PrintFmt :: Short )
355+ ( & capture. frames [ capture. actual_start ..] , backtrace :: PrintFmt :: Short )
355356 } ;
356357
357358 // When printing paths we try to strip the cwd if it exists, otherwise
@@ -363,7 +364,7 @@ impl fmt::Display for Backtrace {
363364 output_filename ( fmt, path, style, cwd. as_ref ( ) . ok ( ) )
364365 } ;
365366
366- let mut f = backtrace_rs :: BacktraceFmt :: new ( fmt, style, & mut print_path) ;
367+ let mut f = backtrace :: BacktraceFmt :: new ( fmt, style, & mut print_path) ;
367368 f. add_context ( ) ?;
368369 for frame in frames {
369370 let mut f = f. frame ( ) ;
@@ -373,7 +374,7 @@ impl fmt::Display for Backtrace {
373374 for symbol in frame. symbols . iter ( ) {
374375 f. print_raw (
375376 frame. frame . ip ( ) ,
376- symbol. name . as_ref ( ) . map ( |b| backtrace_rs :: SymbolName :: new ( b) ) ,
377+ symbol. name . as_ref ( ) . map ( |b| backtrace :: SymbolName :: new ( b) ) ,
377378 symbol. filename . as_ref ( ) . map ( |b| match b {
378379 BytesOrWide :: Bytes ( w) => BytesOrWideString :: Bytes ( w) ,
379380 BytesOrWide :: Wide ( w) => BytesOrWideString :: Wide ( w) ,
@@ -408,7 +409,7 @@ impl Capture {
408409 RawFrame :: Fake => unimplemented ! ( ) ,
409410 } ;
410411 unsafe {
411- backtrace_rs :: resolve_frame_unsynchronized ( frame, |symbol| {
412+ backtrace :: resolve_frame_unsynchronized ( frame, |symbol| {
412413 symbols. push ( BacktraceSymbol {
413414 name : symbol. name ( ) . map ( |m| m. as_bytes ( ) . to_vec ( ) ) ,
414415 filename : symbol. filename_raw ( ) . map ( |b| match b {
0 commit comments