Skip to content

Commit a4e926d

Browse files
committed
std: move "mod tests/benches" to separate files
Also doing fmt inplace as requested.
1 parent db6cbfc commit a4e926d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+16569
-16699
lines changed

library/std/src/backtrace.rs

+3-52
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@
6666
6767
#![unstable(feature = "backtrace", issue = "53487")]
6868

69+
#[cfg(test)]
70+
mod tests;
71+
6972
// NB: A note on resolution of a backtrace:
7073
//
7174
// Backtraces primarily happen in two steps, one is where we actually capture
@@ -438,55 +441,3 @@ impl RawFrame {
438441
}
439442
}
440443
}
441-
442-
#[test]
443-
fn test_debug() {
444-
let backtrace = Backtrace {
445-
inner: Inner::Captured(Mutex::new(Capture {
446-
actual_start: 1,
447-
resolved: true,
448-
frames: vec![
449-
BacktraceFrame {
450-
frame: RawFrame::Fake,
451-
symbols: vec![BacktraceSymbol {
452-
name: Some(b"std::backtrace::Backtrace::create".to_vec()),
453-
filename: Some(BytesOrWide::Bytes(b"rust/backtrace.rs".to_vec())),
454-
lineno: Some(100),
455-
}],
456-
},
457-
BacktraceFrame {
458-
frame: RawFrame::Fake,
459-
symbols: vec![BacktraceSymbol {
460-
name: Some(b"__rust_maybe_catch_panic".to_vec()),
461-
filename: None,
462-
lineno: None,
463-
}],
464-
},
465-
BacktraceFrame {
466-
frame: RawFrame::Fake,
467-
symbols: vec![
468-
BacktraceSymbol {
469-
name: Some(b"std::rt::lang_start_internal".to_vec()),
470-
filename: Some(BytesOrWide::Bytes(b"rust/rt.rs".to_vec())),
471-
lineno: Some(300),
472-
},
473-
BacktraceSymbol {
474-
name: Some(b"std::rt::lang_start".to_vec()),
475-
filename: Some(BytesOrWide::Bytes(b"rust/rt.rs".to_vec())),
476-
lineno: Some(400),
477-
},
478-
],
479-
},
480-
],
481-
})),
482-
};
483-
484-
#[rustfmt::skip]
485-
let expected = "Backtrace [\
486-
\n { fn: \"__rust_maybe_catch_panic\" },\
487-
\n { fn: \"std::rt::lang_start_internal\", file: \"rust/rt.rs\", line: 300 },\
488-
\n { fn: \"std::rt::lang_start\", file: \"rust/rt.rs\", line: 400 },\
489-
\n]";
490-
491-
assert_eq!(format!("{:#?}", backtrace), expected);
492-
}

library/std/src/backtrace/tests.rs

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
use super::*;
2+
3+
#[test]
4+
fn test_debug() {
5+
let backtrace = Backtrace {
6+
inner: Inner::Captured(Mutex::new(Capture {
7+
actual_start: 1,
8+
resolved: true,
9+
frames: vec![
10+
BacktraceFrame {
11+
frame: RawFrame::Fake,
12+
symbols: vec![BacktraceSymbol {
13+
name: Some(b"std::backtrace::Backtrace::create".to_vec()),
14+
filename: Some(BytesOrWide::Bytes(b"rust/backtrace.rs".to_vec())),
15+
lineno: Some(100),
16+
}],
17+
},
18+
BacktraceFrame {
19+
frame: RawFrame::Fake,
20+
symbols: vec![BacktraceSymbol {
21+
name: Some(b"__rust_maybe_catch_panic".to_vec()),
22+
filename: None,
23+
lineno: None,
24+
}],
25+
},
26+
BacktraceFrame {
27+
frame: RawFrame::Fake,
28+
symbols: vec![
29+
BacktraceSymbol {
30+
name: Some(b"std::rt::lang_start_internal".to_vec()),
31+
filename: Some(BytesOrWide::Bytes(b"rust/rt.rs".to_vec())),
32+
lineno: Some(300),
33+
},
34+
BacktraceSymbol {
35+
name: Some(b"std::rt::lang_start".to_vec()),
36+
filename: Some(BytesOrWide::Bytes(b"rust/rt.rs".to_vec())),
37+
lineno: Some(400),
38+
},
39+
],
40+
},
41+
],
42+
})),
43+
};
44+
45+
#[rustfmt::skip]
46+
let expected = "Backtrace [\
47+
\n { fn: \"__rust_maybe_catch_panic\" },\
48+
\n { fn: \"std::rt::lang_start_internal\", file: \"rust/rt.rs\", line: 300 },\
49+
\n { fn: \"std::rt::lang_start\", file: \"rust/rt.rs\", line: 400 },\
50+
\n]";
51+
52+
assert_eq!(format!("{:#?}", backtrace), expected);
53+
}

0 commit comments

Comments
 (0)