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 } ;
9495use crate :: env;
9596use crate :: ffi:: c_void;
9697use crate :: fmt;
9798use crate :: sync:: atomic:: { AtomicUsize , Ordering :: SeqCst } ;
9899use crate :: sync:: Mutex ;
99100use crate :: sys_common:: backtrace:: { lock, output_filename} ;
100101use crate :: vec:: Vec ;
101- use backtrace:: BytesOrWideString ;
102- use backtrace_rs as backtrace;
103102
104103/// A captured OS thread stack backtrace.
105104///
@@ -150,7 +149,7 @@ struct BacktraceFrame {
150149}
151150
152151enum RawFrame {
153- Actual ( backtrace :: Frame ) ,
152+ Actual ( backtrace_rs :: Frame ) ,
154153 #[ cfg( test) ]
155154 Fake ,
156155}
@@ -197,7 +196,7 @@ impl fmt::Debug for BacktraceSymbol {
197196 fn fmt ( & self , fmt : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
198197 write ! ( fmt, "{{ " ) ?;
199198
200- if let Some ( fn_name) = self . name . as_ref ( ) . map ( |b| backtrace :: SymbolName :: new ( b) ) {
199+ if let Some ( fn_name) = self . name . as_ref ( ) . map ( |b| backtrace_rs :: SymbolName :: new ( b) ) {
201200 write ! ( fmt, "fn: \" {:#}\" " , fn_name) ?;
202201 } else {
203202 write ! ( fmt, "fn: <unknown>" ) ?;
@@ -223,7 +222,7 @@ impl fmt::Debug for BytesOrWide {
223222 BytesOrWide :: Bytes ( w) => BytesOrWideString :: Bytes ( w) ,
224223 BytesOrWide :: Wide ( w) => BytesOrWideString :: Wide ( w) ,
225224 } ,
226- backtrace :: PrintFmt :: Short ,
225+ backtrace_rs :: PrintFmt :: Short ,
227226 crate :: env:: current_dir ( ) . as_ref ( ) . ok ( ) ,
228227 )
229228 }
@@ -305,7 +304,7 @@ impl Backtrace {
305304 let mut frames = Vec :: new ( ) ;
306305 let mut actual_start = None ;
307306 unsafe {
308- backtrace :: trace_unsynchronized ( |frame| {
307+ backtrace_rs :: trace_unsynchronized ( |frame| {
309308 frames. push ( BacktraceFrame {
310309 frame : RawFrame :: Actual ( frame. clone ( ) ) ,
311310 symbols : Vec :: new ( ) ,
@@ -356,9 +355,9 @@ impl fmt::Display for Backtrace {
356355
357356 let full = fmt. alternate ( ) ;
358357 let ( frames, style) = if full {
359- ( & capture. frames [ ..] , backtrace :: PrintFmt :: Full )
358+ ( & capture. frames [ ..] , backtrace_rs :: PrintFmt :: Full )
360359 } else {
361- ( & capture. frames [ capture. actual_start ..] , backtrace :: PrintFmt :: Short )
360+ ( & capture. frames [ capture. actual_start ..] , backtrace_rs :: PrintFmt :: Short )
362361 } ;
363362
364363 // When printing paths we try to strip the cwd if it exists, otherwise
@@ -370,7 +369,7 @@ impl fmt::Display for Backtrace {
370369 output_filename ( fmt, path, style, cwd. as_ref ( ) . ok ( ) )
371370 } ;
372371
373- let mut f = backtrace :: BacktraceFmt :: new ( fmt, style, & mut print_path) ;
372+ let mut f = backtrace_rs :: BacktraceFmt :: new ( fmt, style, & mut print_path) ;
374373 f. add_context ( ) ?;
375374 for frame in frames {
376375 let mut f = f. frame ( ) ;
@@ -380,7 +379,7 @@ impl fmt::Display for Backtrace {
380379 for symbol in frame. symbols . iter ( ) {
381380 f. print_raw (
382381 frame. frame . ip ( ) ,
383- symbol. name . as_ref ( ) . map ( |b| backtrace :: SymbolName :: new ( b) ) ,
382+ symbol. name . as_ref ( ) . map ( |b| backtrace_rs :: SymbolName :: new ( b) ) ,
384383 symbol. filename . as_ref ( ) . map ( |b| match b {
385384 BytesOrWide :: Bytes ( w) => BytesOrWideString :: Bytes ( w) ,
386385 BytesOrWide :: Wide ( w) => BytesOrWideString :: Wide ( w) ,
@@ -415,7 +414,7 @@ impl Capture {
415414 RawFrame :: Fake => unimplemented ! ( ) ,
416415 } ;
417416 unsafe {
418- backtrace :: resolve_frame_unsynchronized ( frame, |symbol| {
417+ backtrace_rs :: resolve_frame_unsynchronized ( frame, |symbol| {
419418 symbols. push ( BacktraceSymbol {
420419 name : symbol. name ( ) . map ( |m| m. as_bytes ( ) . to_vec ( ) ) ,
421420 filename : symbol. filename_raw ( ) . map ( |b| match b {
0 commit comments