Skip to content

Commit a057c2d

Browse files
committed
dbg macro: align line number to 4 digits
1 parent ea43c3c commit a057c2d

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/libstd/macros.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ macro_rules! eprintln {
221221
/// ```rust
222222
/// let a = 2;
223223
/// let b = dbg!(a * 2) + 1;
224-
/// // ^-- prints: [src/main.rs:2] a * 2 = 4
224+
/// // ^-- prints: [src/main.rs:0002] a * 2 = 4
225225
/// assert_eq!(b, 5);
226226
/// ```
227227
///
@@ -267,7 +267,7 @@ macro_rules! eprintln {
267267
/// This prints to [stderr]:
268268
///
269269
/// ```text,ignore
270-
/// [src/main.rs:4] n.checked_sub(4) = None
270+
/// [src/main.rs:0004] n.checked_sub(4) = None
271271
/// ```
272272
///
273273
/// Naive factorial implementation:
@@ -287,15 +287,15 @@ macro_rules! eprintln {
287287
/// This prints to [stderr]:
288288
///
289289
/// ```text,ignore
290-
/// [src/main.rs:3] n <= 1 = false
291-
/// [src/main.rs:3] n <= 1 = false
292-
/// [src/main.rs:3] n <= 1 = false
293-
/// [src/main.rs:3] n <= 1 = true
294-
/// [src/main.rs:4] 1 = 1
295-
/// [src/main.rs:5] n * factorial(n - 1) = 2
296-
/// [src/main.rs:5] n * factorial(n - 1) = 6
297-
/// [src/main.rs:5] n * factorial(n - 1) = 24
298-
/// [src/main.rs:11] factorial(4) = 24
290+
/// [src/main.rs:0003] n <= 1 = false
291+
/// [src/main.rs:0003] n <= 1 = false
292+
/// [src/main.rs:0003] n <= 1 = false
293+
/// [src/main.rs:0003] n <= 1 = true
294+
/// [src/main.rs:0004] 1 = 1
295+
/// [src/main.rs:0005] n * factorial(n - 1) = 2
296+
/// [src/main.rs:0005] n * factorial(n - 1) = 6
297+
/// [src/main.rs:0005] n * factorial(n - 1) = 24
298+
/// [src/main.rs:0011] factorial(4) = 24
299299
/// ```
300300
///
301301
/// The `dbg!(..)` macro moves the input:
@@ -319,7 +319,7 @@ macro_rules! dbg {
319319
// of temporaries - https://stackoverflow.com/a/48732525/1063961
320320
match $val {
321321
tmp => {
322-
eprintln!("[{}:{}] {} = {:#?}",
322+
eprintln!("[{}:{:04}] {} = {:#?}",
323323
file!(), line!(), stringify!($val), &tmp);
324324
tmp
325325
}

src/test/ui/rfc-2361-dbg-macro/dbg-macro-expected-behavior.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -55,31 +55,31 @@ fn test() {
5555

5656
fn validate_stderr(stderr: Vec<String>) {
5757
assert_eq!(stderr, &[
58-
":21] Unit = Unit",
58+
":0021] Unit = Unit",
5959

60-
":22] a = Unit",
60+
":0022] a = Unit",
6161

62-
":28] Point{x: 42, y: 24,} = Point {",
62+
":0028] Point{x: 42, y: 24,} = Point {",
6363
" x: 42,",
6464
" y: 24",
6565
"}",
6666

67-
":29] b = Point {",
67+
":0029] b = Point {",
6868
" x: 42,",
6969
" y: 24",
7070
"}",
7171

72-
":38] &a = NoCopy(",
72+
":0038] &a = NoCopy(",
7373
" 1337",
7474
")",
7575

76-
":38] dbg!(& a) = NoCopy(",
76+
":0038] dbg!(& a) = NoCopy(",
7777
" 1337",
7878
")",
79-
":43] f(&42) = 42",
79+
":0043] f(&42) = 42",
8080

8181
"before",
82-
":48] { foo += 1; eprintln!(\"before\"); 7331 } = 7331",
82+
":0048] { foo += 1; eprintln!(\"before\"); 7331 } = 7331",
8383
]);
8484
}
8585

0 commit comments

Comments
 (0)