Skip to content

Commit 5546d81

Browse files
oli-obkoli-obk
committed
Put the first field on a new line, too
1 parent bd7a397 commit 5546d81

File tree

5 files changed

+115
-64
lines changed

5 files changed

+115
-64
lines changed

‎examples/basic.stdout‎

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,92 @@
1-
1:main┐basic::hierarchical-example version=0.1
2-
1:main├┐basic::hierarchical-example version=0.1
3-
1:main│└┬─┬─ basic::server host="localhost"
1+
1:main┐basic::hierarchical-example
2+
1:main┐ version=0.1
3+
1:main├┬─┬─ basic::hierarchical-example
4+
1:main││ └─ version=0.1
5+
1:main│└┬─┬─ basic::server
6+
1:main│ │ ├─ host="localhost"
47
1:main│ │ └─ port=8080
58
1:main│ ├─ Xms INFO basic starting
69
1:main│ ├─ Xs INFO basic listening
7-
1:main│ ├┬─┬─ basic::server host="localhost"
10+
1:main│ ├┬─┬─ basic::server
11+
1:main│ ││ ├─ host="localhost"
812
1:main│ ││ └─ port=8080
9-
1:main│ │└┬─┬─ basic::conn peer_addr="82.9.9.9"
13+
1:main│ │└┬─┬─ basic::conn
14+
1:main│ │ │ ├─ peer_addr="82.9.9.9"
1015
1:main│ │ │ └─ port=42381
1116
1:main│ │ ├─ Xms DEBUG basic connected
1217
1:main│ │ ├─┬─ Xms DEBUG basic message received
1318
1:main│ │ │ └─ length=2
14-
1:main│ │┌┴┬─ basic::conn peer_addr="82.9.9.9"
19+
1:main│ │┌┴┬─ basic::conn
20+
1:main│ ││ ├─ peer_addr="82.9.9.9"
1521
1:main│ ││ └─ port=42381
16-
1:main│ ├┴┬─ basic::server host="localhost"
22+
1:main│ ├┴┬─ basic::server
23+
1:main│ │ ├─ host="localhost"
1724
1:main│ │ └─ port=8080
18-
1:main│ ├┬─┬─ basic::server host="localhost"
25+
1:main│ ├┬─┬─ basic::server
26+
1:main│ ││ ├─ host="localhost"
1927
1:main│ ││ └─ port=8080
20-
1:main│ │└┬─┬─ basic::conn peer_addr="8.8.8.8"
28+
1:main│ │└┬─┬─ basic::conn
29+
1:main│ │ │ ├─ peer_addr="8.8.8.8"
2130
1:main│ │ │ └─ port=18230
2231
1:main│ │ ├─ Xms DEBUG basic connected
23-
1:main│ │┌┴┬─ basic::conn peer_addr="8.8.8.8"
32+
1:main│ │┌┴┬─ basic::conn
33+
1:main│ ││ ├─ peer_addr="8.8.8.8"
2434
1:main│ ││ └─ port=18230
25-
1:main│ ├┴┬─ basic::server host="localhost"
35+
1:main│ ├┴┬─ basic::server
36+
1:main│ │ ├─ host="localhost"
2637
1:main│ │ └─ port=8080
27-
1:main│ ├┬─┬─ basic::server host="localhost"
38+
1:main│ ├┬─┬─ basic::server
39+
1:main│ ││ ├─ host="localhost"
2840
1:main│ ││ └─ port=8080
2941
1:main│ │└┬─┬─ basic::foomp 42 <- format string
3042
1:main│ │ │ └─ normal_var=43
3143
1:main│ │ ├─ Xms ERROR basic hello
3244
1:main│ │┌┴┬─ basic::foomp 42 <- format string
3345
1:main│ ││ └─ normal_var=43
34-
1:main│ ├┴┬─ basic::server host="localhost"
46+
1:main│ ├┴┬─ basic::server
47+
1:main│ │ ├─ host="localhost"
3548
1:main│ │ └─ port=8080
36-
1:main│ ├┬─┬─ basic::server host="localhost"
49+
1:main│ ├┬─┬─ basic::server
50+
1:main│ ││ ├─ host="localhost"
3751
1:main│ ││ └─ port=8080
38-
1:main│ │└┬─┬─ basic::conn peer_addr="82.9.9.9"
52+
1:main│ │└┬─┬─ basic::conn
53+
1:main│ │ │ ├─ peer_addr="82.9.9.9"
3954
1:main│ │ │ └─ port=42381
4055
1:main│ │ ├─┬─ Xms WARN basic weak encryption requested
4156
1:main│ │ │ └─ algo="xor"
4257
1:main│ │ ├─┬─ Xms DEBUG basic response sent
4358
1:main│ │ │ └─ length=8
4459
1:main│ │ ├─ Xms DEBUG basic disconnected
45-
1:main│ │┌┴┬─ basic::conn peer_addr="82.9.9.9"
60+
1:main│ │┌┴┬─ basic::conn
61+
1:main│ ││ ├─ peer_addr="82.9.9.9"
4662
1:main│ ││ └─ port=42381
47-
1:main│ ├┴┬─ basic::server host="localhost"
63+
1:main│ ├┴┬─ basic::server
64+
1:main│ │ ├─ host="localhost"
4865
1:main│ │ └─ port=8080
49-
1:main│ ├┬─┬─ basic::server host="localhost"
66+
1:main│ ├┬─┬─ basic::server
67+
1:main│ ││ ├─ host="localhost"
5068
1:main│ ││ └─ port=8080
51-
1:main│ │└┬─┬─ basic::conn peer_addr="8.8.8.8"
69+
1:main│ │└┬─┬─ basic::conn
70+
1:main│ │ │ ├─ peer_addr="8.8.8.8"
5271
1:main│ │ │ └─ port=18230
5372
1:main│ │ ├─┬─ Xms DEBUG basic message received
5473
1:main│ │ │ └─ length=5
5574
1:main│ │ ├─┬─ Xms DEBUG basic response sent
5675
1:main│ │ │ └─ length=8
5776
1:main│ │ ├─ Xms DEBUG basic disconnected
58-
1:main│ │┌┴┬─ basic::conn peer_addr="8.8.8.8"
77+
1:main│ │┌┴┬─ basic::conn
78+
1:main│ ││ ├─ peer_addr="8.8.8.8"
5979
1:main│ ││ └─ port=18230
60-
1:main│ ├┴┬─ basic::server host="localhost"
80+
1:main│ ├┴┬─ basic::server
81+
1:main│ │ ├─ host="localhost"
6182
1:main│ │ └─ port=8080
6283
1:main│ ├─ Xs WARN basic internal error
6384
1:main│ ├─ Xs ERROR basic this is a log message
6485
1:main│ ├─ Xs INFO basic exit
65-
1:main│┌┴┬─ basic::server host="localhost"
86+
1:main│┌┴┬─ basic::server
87+
1:main││ ├─ host="localhost"
6688
1:main││ └─ port=8080
67-
1:main├┘basic::hierarchical-example version=0.1
68-
1:main┘basic::hierarchical-example version=0.1
89+
1:main├┴┬─ basic::hierarchical-example
90+
1:main│ └─ version=0.1
91+
1:main┘basic::hierarchical-example
92+
1:main┘ version=0.1

‎examples/quiet.stdout‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
1-
1:main┐quiet::hierarchical-example version=0.1
2-
1:main├─┬─┬─ quiet::server host="localhost"
1+
1:main┐quiet::hierarchical-example
2+
1:main┐ version=0.1
3+
1:main├─┬─┬─ quiet::server
4+
1:main│ │ ├─ host="localhost"
35
1:main│ │ └─ port=8080
46
1:main│ ├─ Xms INFO quiet starting
57
1:main│ ├─ Xms INFO quiet listening
6-
1:main│ ├─┬─┬─ quiet::conn peer_addr="82.9.9.9"
8+
1:main│ ├─┬─┬─ quiet::conn
9+
1:main│ │ │ ├─ peer_addr="82.9.9.9"
710
1:main│ │ │ └─ port=42381
811
1:main│ │ ├─ Xms DEBUG quiet connected
912
1:main│ │ ├─┬─ Xms DEBUG quiet message received
1013
1:main│ │ │ └─ length=2
1114
1:main│ ├─┘
12-
1:main│ ├─┬─┬─ quiet::conn peer_addr="8.8.8.8"
15+
1:main│ ├─┬─┬─ quiet::conn
16+
1:main│ │ │ ├─ peer_addr="8.8.8.8"
1317
1:main│ │ │ └─ port=18230
1418
1:main│ │ ├─ Xms DEBUG quiet connected
1519
1:main│ ├─┘
1620
1:main│ ├─┬─┬─ quiet::foomp 42 <- format string
1721
1:main│ │ │ └─ normal_var=43
1822
1:main│ │ ├─ Xms ERROR quiet hello
1923
1:main│ ├─┘
20-
1:main│ ├─┬─┬─ quiet::conn peer_addr="82.9.9.9"
24+
1:main│ ├─┬─┬─ quiet::conn
25+
1:main│ │ │ ├─ peer_addr="82.9.9.9"
2126
1:main│ │ │ └─ port=42381
2227
1:main│ │ ├─┬─ Xms WARN quiet weak encryption requested
2328
1:main│ │ │ └─ algo="xor"
2429
1:main│ │ ├─┬─ Xms DEBUG quiet response sent
2530
1:main│ │ │ └─ length=8
2631
1:main│ │ ├─ Xms DEBUG quiet disconnected
2732
1:main│ ├─┘
28-
1:main│ ├─┬─┬─ quiet::conn peer_addr="8.8.8.8"
33+
1:main│ ├─┬─┬─ quiet::conn
34+
1:main│ │ │ ├─ peer_addr="8.8.8.8"
2935
1:main│ │ │ └─ port=18230
3036
1:main│ │ ├─┬─ Xms DEBUG quiet message received
3137
1:main│ │ │ └─ length=5

‎examples/wraparound.stdout‎

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,72 @@
1-
1:main┐wraparound::recurse i=0
1+
1:main┐wraparound::recurse
2+
1:main┐ i=0
23
1:main├─ Xms WARN wraparound boop
3-
1:main├─┐wraparound::recurse i=1
4+
1:main├─┬─┬─ wraparound::recurse
5+
1:main│ │ └─ i=1
46
1:main│ ├─ Xms WARN wraparound boop
5-
1:main│ ├─┐wraparound::recurse i=2
7+
1:main│ ├─┬─┬─ wraparound::recurse
8+
1:main│ │ │ └─ i=2
69
1:main│ │ ├─ Xms WARN wraparound boop
7-
1:main│ │ ├─┐wraparound::recurse i=3
10+
1:main│ │ ├─┬─┬─ wraparound::recurse
11+
1:main│ │ │ │ └─ i=3
812
1:main│ │ │ ├─ Xms WARN wraparound boop
9-
1:main│ │ │ ├─┐wraparound::recurse i=4
13+
1:main│ │ │ ├─┬─┬─ wraparound::recurse
14+
1:main│ │ │ │ │ └─ i=4
1015
1:main────────┘
1116
1:main Xms WARN wraparound boop
12-
1:main┐wraparound::recurse i=5
17+
1:main┐wraparound::recurse
18+
1:main┐ i=5
1319
1:main├─ Xms WARN wraparound boop
14-
1:main├─┐wraparound::recurse i=6
20+
1:main├─┬─┬─ wraparound::recurse
21+
1:main│ │ └─ i=6
1522
1:main│ ├─ Xms WARN wraparound boop
16-
1:main│ ├─┐wraparound::recurse i=7
23+
1:main│ ├─┬─┬─ wraparound::recurse
24+
1:main│ │ │ └─ i=7
1725
1:main│ │ ├─ Xms WARN wraparound boop
18-
1:main│ │ ├─┐wraparound::recurse i=8
26+
1:main│ │ ├─┬─┬─ wraparound::recurse
27+
1:main│ │ │ │ └─ i=8
1928
1:main│ │ │ ├─ Xms WARN wraparound boop
20-
1:main│ │ │ ├─┐wraparound::recurse i=9
29+
1:main│ │ │ ├─┬─┬─ wraparound::recurse
30+
1:main│ │ │ │ │ └─ i=9
2131
1:main────────┘
2232
1:main Xms WARN wraparound boop
23-
1:main┐wraparound::recurse i=10
33+
1:main┐wraparound::recurse
34+
1:main┐ i=10
2435
1:main├─ Xms WARN wraparound boop
25-
1:main├─┐wraparound::recurse i=11
36+
1:main├─┬─┬─ wraparound::recurse
37+
1:main│ │ └─ i=11
2638
1:main│ ├─ Xms WARN wraparound boop
27-
1:main│ ├─┐wraparound::recurse i=12
39+
1:main│ ├─┬─┬─ wraparound::recurse
40+
1:main│ │ │ └─ i=12
2841
1:main│ │ ├─ Xms WARN wraparound boop
29-
1:main│ │ ├─┐wraparound::recurse i=13
42+
1:main│ │ ├─┬─┬─ wraparound::recurse
43+
1:main│ │ │ │ └─ i=13
3044
1:main│ │ │ ├─ Xms WARN wraparound boop
31-
1:main│ │ │ ├─┐wraparound::recurse i=14
45+
1:main│ │ │ ├─┬─┬─ wraparound::recurse
46+
1:main│ │ │ │ │ └─ i=14
3247
1:main────────┘
3348
1:main Xms WARN wraparound boop
34-
1:main┐wraparound::recurse i=15
49+
1:main┐wraparound::recurse
50+
1:main┐ i=15
3551
1:main├─ Xms WARN wraparound boop
36-
1:main├─┐wraparound::recurse i=16
52+
1:main├─┬─┬─ wraparound::recurse
53+
1:main│ │ └─ i=16
3754
1:main│ ├─ Xms WARN wraparound boop
38-
1:main│ ├─┐wraparound::recurse i=17
55+
1:main│ ├─┬─┬─ wraparound::recurse
56+
1:main│ │ │ └─ i=17
3957
1:main│ │ ├─ Xms WARN wraparound boop
40-
1:main│ │ ├─┐wraparound::recurse i=18
58+
1:main│ │ ├─┬─┬─ wraparound::recurse
59+
1:main│ │ │ │ └─ i=18
4160
1:main│ │ │ ├─ Xms WARN wraparound boop
42-
1:main│ │ │ ├─┐wraparound::recurse i=19
61+
1:main│ │ │ ├─┬─┬─ wraparound::recurse
62+
1:main│ │ │ │ │ └─ i=19
4363
1:main────────┘
4464
1:main Xms WARN wraparound boop
45-
1:main┐wraparound::recurse i=20
65+
1:main┐wraparound::recurse
66+
1:main┐ i=20
4667
1:main├─ Xms WARN wraparound boop
47-
1:main├─┐wraparound::recurse i=21
68+
1:main├─┬─┬─ wraparound::recurse
69+
1:main│ │ └─ i=21
4870
1:main│ ├─ Xms WARN wraparound boop
4971
1:main│ ├─ Xms WARN wraparound bop
5072
1:main├─┘

‎src/format.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,24 +222,20 @@ impl Buffers {
222222

223223
pub struct FmtEvent<'a> {
224224
pub bufs: &'a mut Buffers,
225-
pub comma: bool,
226225
}
227226

228227
impl<'a> Visit for FmtEvent<'a> {
229228
fn record_debug(&mut self, field: &Field, value: &dyn fmt::Debug) {
230229
let buf = &mut self.bufs.current_buf;
231-
let comma = if self.comma { "\n" } else { "" };
232230
match field.name() {
233231
"message" => {
234-
write!(buf, "{} {:?}", comma, value).unwrap();
235-
self.comma = true;
232+
write!(buf, " {:?}", value).unwrap();
236233
}
237234
// Skip fields that are actually log metadata that have already been handled
238235
#[cfg(feature = "tracing-log")]
239236
name if name.starts_with("log.") => {}
240237
name => {
241-
write!(buf, "{} {}={:?}", comma, name, value).unwrap();
242-
self.comma = true;
238+
write!(buf, "\n {}={:?}", name, value).unwrap();
243239
}
244240
}
245241
}

‎src/lib.rs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,20 @@ where
212212
V: fmt::Display + 'a,
213213
{
214214
let mut kvs = kvs.into_iter();
215+
let nl = if self.config.bracketed_fields {
216+
""
217+
} else {
218+
"\n "
219+
};
215220
if let Some((k, v)) = kvs.next() {
216221
if k == "message" {
217-
write!(buf, "{}", v)?;
222+
write!(buf, " {}", v)?;
218223
} else {
219-
write!(buf, "{}={}", k, v)?;
224+
write!(buf, "{nl}{}={}", k, v)?;
220225
}
221226
}
222227
for (k, v) in kvs {
223-
write!(buf, "\n {}={}", k, v)?;
228+
write!(buf, "{nl}{}={}", k, v)?;
224229
}
225230
Ok(())
226231
}
@@ -272,8 +277,6 @@ where
272277
self.styled(Style::new().fg(Color::Green).bold(), "{") // Style::new().fg(Color::Green).dimmed().paint("{")
273278
)
274279
.unwrap();
275-
} else {
276-
write!(current_buf, " ").unwrap();
277280
}
278281
self.print_kvs(&mut current_buf, data.kvs.iter().map(|(k, v)| (*k, v)))
279282
.unwrap();
@@ -409,7 +412,7 @@ where
409412
.expect("Unable to write to buffer");
410413
}
411414

412-
let mut visitor = FmtEvent { comma: false, bufs };
415+
let mut visitor = FmtEvent { bufs };
413416
event.record(&mut visitor);
414417
visitor
415418
.bufs

0 commit comments

Comments
 (0)