diff --git a/examples/basic.stdout b/examples/basic.stdout index e1d7bb3..aeb50f4 100644 --- a/examples/basic.stdout +++ b/examples/basic.stdout @@ -1,41 +1,41 @@ 1:main┐basic::hierarchical-example version=0.1 -1:main├┐basic::hierarchical-example version=0.1 -1:main│└┐basic::server host="localhost", port=8080 -1:main│ ├─ Xms INFO basic starting -1:main│ ├─ Xs INFO basic listening -1:main│ ├┐basic::server host="localhost", port=8080 -1:main│ │└┐basic::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms DEBUG basic connected -1:main│ │ ├─ Xms DEBUG basic message received, length=2 -1:main│ │┌┘basic::conn peer_addr="82.9.9.9", port=42381 -1:main│ ├┘basic::server host="localhost", port=8080 -1:main│ ├┐basic::server host="localhost", port=8080 -1:main│ │└┐basic::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG basic connected -1:main│ │┌┘basic::conn peer_addr="8.8.8.8", port=18230 -1:main│ ├┘basic::server host="localhost", port=8080 -1:main│ ├┐basic::server host="localhost", port=8080 -1:main│ │└┐basic::foomp 42 <- format string, normal_var=43 -1:main│ │ ├─ Xms ERROR basic hello -1:main│ │┌┘basic::foomp 42 <- format string, normal_var=43 -1:main│ ├┘basic::server host="localhost", port=8080 -1:main│ ├┐basic::server host="localhost", port=8080 -1:main│ │└┐basic::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms WARN basic weak encryption requested, algo="xor" -1:main│ │ ├─ Xms DEBUG basic response sent, length=8 -1:main│ │ ├─ Xms DEBUG basic disconnected -1:main│ │┌┘basic::conn peer_addr="82.9.9.9", port=42381 -1:main│ ├┘basic::server host="localhost", port=8080 -1:main│ ├┐basic::server host="localhost", port=8080 -1:main│ │└┐basic::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG basic message received, length=5 -1:main│ │ ├─ Xms DEBUG basic response sent, length=8 -1:main│ │ ├─ Xms DEBUG basic disconnected -1:main│ │┌┘basic::conn peer_addr="8.8.8.8", port=18230 -1:main│ ├┘basic::server host="localhost", port=8080 -1:main│ ├─ Xs WARN basic internal error -1:main│ ├─ Xs ERROR basic this is a log message -1:main│ ├─ Xs INFO basic exit -1:main│┌┘basic::server host="localhost", port=8080 -1:main├┘basic::hierarchical-example version=0.1 +1:main└┐basic::hierarchical-example version=0.1 +1:main └┐basic::server host="localhost", port=8080 +1:main ├─ Xms INFO basic starting +1:main ├─ Xs INFO basic listening +1:main └┐basic::server host="localhost", port=8080 +1:main └┐basic::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms DEBUG basic connected +1:main ├─ Xms DEBUG basic message received, length=2 +1:main ┌┘basic::conn peer_addr="82.9.9.9", port=42381 +1:main ┌┘basic::server host="localhost", port=8080 +1:main └┐basic::server host="localhost", port=8080 +1:main └┐basic::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG basic connected +1:main ┌┘basic::conn peer_addr="8.8.8.8", port=18230 +1:main ┌┘basic::server host="localhost", port=8080 +1:main └┐basic::server host="localhost", port=8080 +1:main └┐basic::foomp 42 <- format string, normal_var=43 +1:main ├─ Xms ERROR basic hello +1:main ┌┘basic::foomp 42 <- format string, normal_var=43 +1:main ┌┘basic::server host="localhost", port=8080 +1:main └┐basic::server host="localhost", port=8080 +1:main └┐basic::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms WARN basic weak encryption requested, algo="xor" +1:main ├─ Xms DEBUG basic response sent, length=8 +1:main ├─ Xms DEBUG basic disconnected +1:main ┌┘basic::conn peer_addr="82.9.9.9", port=42381 +1:main ┌┘basic::server host="localhost", port=8080 +1:main └┐basic::server host="localhost", port=8080 +1:main └┐basic::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG basic message received, length=5 +1:main ├─ Xms DEBUG basic response sent, length=8 +1:main ├─ Xms DEBUG basic disconnected +1:main ┌┘basic::conn peer_addr="8.8.8.8", port=18230 +1:main ┌┘basic::server host="localhost", port=8080 +1:main ├─ Xs WARN basic internal error +1:main ├─ Xs ERROR basic this is a log message +1:main ├─ Xs INFO basic exit +1:main ┌┘basic::server host="localhost", port=8080 +1:main┌┘basic::hierarchical-example version=0.1 1:main┘basic::hierarchical-example version=0.1 diff --git a/examples/basic_non_verbose.stdout b/examples/basic_non_verbose.stdout index fcdd9b5..a409970 100644 --- a/examples/basic_non_verbose.stdout +++ b/examples/basic_non_verbose.stdout @@ -1,29 +1,29 @@ 1:main┐basic_non_verbose::hierarchical-example version=0.1 -1:main├─┐basic_non_verbose::server host="localhost", port=8080 -1:main│ ├─ Xms INFO basic_non_verbose starting -1:main│ ├─ Xs INFO basic_non_verbose listening -1:main│ ├─┐basic_non_verbose::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms DEBUG basic_non_verbose connected -1:main│ │ ├─ Xms DEBUG basic_non_verbose message received, length=2 -1:main│ ├─┘ -1:main│ ├─┐basic_non_verbose::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG basic_non_verbose connected -1:main│ ├─┘ -1:main│ ├─┐basic_non_verbose::foomp 42 <- format string, normal_var=43 -1:main│ │ ├─ Xms ERROR basic_non_verbose hello -1:main│ ├─┘ -1:main│ ├─┐basic_non_verbose::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms WARN basic_non_verbose weak encryption requested, algo="xor" -1:main│ │ ├─ Xms DEBUG basic_non_verbose response sent, length=8 -1:main│ │ ├─ Xms DEBUG basic_non_verbose disconnected -1:main│ ├─┘ -1:main│ ├─┐basic_non_verbose::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG basic_non_verbose message received, length=5 -1:main│ │ ├─ Xms DEBUG basic_non_verbose response sent, length=8 -1:main│ │ ├─ Xms DEBUG basic_non_verbose disconnected -1:main│ ├─┘ -1:main│ ├─ Xs WARN basic_non_verbose internal error -1:main│ ├─ Xs ERROR basic_non_verbose this is a log message -1:main│ ├─ Xs INFO basic_non_verbose exit -1:main├─┘ +1:main└─┐basic_non_verbose::server host="localhost", port=8080 +1:main ├─ Xms INFO basic_non_verbose starting +1:main ├─ Xs INFO basic_non_verbose listening +1:main └─┐basic_non_verbose::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms DEBUG basic_non_verbose connected +1:main ├─ Xms DEBUG basic_non_verbose message received, length=2 +1:main ┌─┘ +1:main └─┐basic_non_verbose::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG basic_non_verbose connected +1:main ┌─┘ +1:main └─┐basic_non_verbose::foomp 42 <- format string, normal_var=43 +1:main ├─ Xms ERROR basic_non_verbose hello +1:main ┌─┘ +1:main └─┐basic_non_verbose::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms WARN basic_non_verbose weak encryption requested, algo="xor" +1:main ├─ Xms DEBUG basic_non_verbose response sent, length=8 +1:main ├─ Xms DEBUG basic_non_verbose disconnected +1:main ┌─┘ +1:main └─┐basic_non_verbose::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG basic_non_verbose message received, length=5 +1:main ├─ Xms DEBUG basic_non_verbose response sent, length=8 +1:main ├─ Xms DEBUG basic_non_verbose disconnected +1:main ┌─┘ +1:main ├─ Xs WARN basic_non_verbose internal error +1:main ├─ Xs ERROR basic_non_verbose this is a log message +1:main ├─ Xs INFO basic_non_verbose exit +1:main┌─┘ 1:main┘ diff --git a/examples/basic_verbose_entry.stdout b/examples/basic_verbose_entry.stdout index d564a50..f5d38f2 100644 --- a/examples/basic_verbose_entry.stdout +++ b/examples/basic_verbose_entry.stdout @@ -1,35 +1,35 @@ 1:main┐basic_verbose_entry::hierarchical-example version=0.1 -1:main├┐basic_verbose_entry::hierarchical-example version=0.1 -1:main│└┐basic_verbose_entry::server host="localhost", port=8080 -1:main│ ├─ Xms INFO basic_verbose_entry starting -1:main│ ├─ Xs INFO basic_verbose_entry listening -1:main│ ├┐basic_verbose_entry::server host="localhost", port=8080 -1:main│ │└┐basic_verbose_entry::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms DEBUG basic_verbose_entry connected -1:main│ │ ├─ Xms DEBUG basic_verbose_entry message received, length=2 -1:main│ ├─┘ -1:main│ ├┐basic_verbose_entry::server host="localhost", port=8080 -1:main│ │└┐basic_verbose_entry::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG basic_verbose_entry connected -1:main│ ├─┘ -1:main│ ├┐basic_verbose_entry::server host="localhost", port=8080 -1:main│ │└┐basic_verbose_entry::foomp 42 <- format string, normal_var=43 -1:main│ │ ├─ Xms ERROR basic_verbose_entry hello -1:main│ ├─┘ -1:main│ ├┐basic_verbose_entry::server host="localhost", port=8080 -1:main│ │└┐basic_verbose_entry::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms WARN basic_verbose_entry weak encryption requested, algo="xor" -1:main│ │ ├─ Xms DEBUG basic_verbose_entry response sent, length=8 -1:main│ │ ├─ Xms DEBUG basic_verbose_entry disconnected -1:main│ ├─┘ -1:main│ ├┐basic_verbose_entry::server host="localhost", port=8080 -1:main│ │└┐basic_verbose_entry::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG basic_verbose_entry message received, length=5 -1:main│ │ ├─ Xms DEBUG basic_verbose_entry response sent, length=8 -1:main│ │ ├─ Xms DEBUG basic_verbose_entry disconnected -1:main│ ├─┘ -1:main│ ├─ Xs WARN basic_verbose_entry internal error -1:main│ ├─ Xs ERROR basic_verbose_entry this is a log message -1:main│ ├─ Xs INFO basic_verbose_entry exit -1:main├─┘ +1:main└┐basic_verbose_entry::hierarchical-example version=0.1 +1:main └┐basic_verbose_entry::server host="localhost", port=8080 +1:main ├─ Xms INFO basic_verbose_entry starting +1:main ├─ Xs INFO basic_verbose_entry listening +1:main └┐basic_verbose_entry::server host="localhost", port=8080 +1:main └┐basic_verbose_entry::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms DEBUG basic_verbose_entry connected +1:main ├─ Xms DEBUG basic_verbose_entry message received, length=2 +1:main ┌─┘ +1:main └┐basic_verbose_entry::server host="localhost", port=8080 +1:main └┐basic_verbose_entry::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG basic_verbose_entry connected +1:main ┌─┘ +1:main └┐basic_verbose_entry::server host="localhost", port=8080 +1:main └┐basic_verbose_entry::foomp 42 <- format string, normal_var=43 +1:main ├─ Xms ERROR basic_verbose_entry hello +1:main ┌─┘ +1:main └┐basic_verbose_entry::server host="localhost", port=8080 +1:main └┐basic_verbose_entry::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms WARN basic_verbose_entry weak encryption requested, algo="xor" +1:main ├─ Xms DEBUG basic_verbose_entry response sent, length=8 +1:main ├─ Xms DEBUG basic_verbose_entry disconnected +1:main ┌─┘ +1:main └┐basic_verbose_entry::server host="localhost", port=8080 +1:main └┐basic_verbose_entry::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG basic_verbose_entry message received, length=5 +1:main ├─ Xms DEBUG basic_verbose_entry response sent, length=8 +1:main ├─ Xms DEBUG basic_verbose_entry disconnected +1:main ┌─┘ +1:main ├─ Xs WARN basic_verbose_entry internal error +1:main ├─ Xs ERROR basic_verbose_entry this is a log message +1:main ├─ Xs INFO basic_verbose_entry exit +1:main┌─┘ 1:main┘ diff --git a/examples/basic_verbose_exit.stdout b/examples/basic_verbose_exit.stdout index 08898a2..020f738 100644 --- a/examples/basic_verbose_exit.stdout +++ b/examples/basic_verbose_exit.stdout @@ -1,35 +1,35 @@ 1:main┐basic_verbose_exit::hierarchical-example version=0.1 -1:main├─┐basic_verbose_exit::server host="localhost", port=8080 -1:main│ ├─ Xms INFO basic_verbose_exit starting -1:main│ ├─ Xs INFO basic_verbose_exit listening -1:main│ ├─┐basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms DEBUG basic_verbose_exit connected -1:main│ │ ├─ Xms DEBUG basic_verbose_exit message received, length=2 -1:main│ │┌┘basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381 -1:main│ ├┘basic_verbose_exit::server host="localhost", port=8080 -1:main│ ├─┐basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG basic_verbose_exit connected -1:main│ │┌┘basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230 -1:main│ ├┘basic_verbose_exit::server host="localhost", port=8080 -1:main│ ├─┐basic_verbose_exit::foomp 42 <- format string, normal_var=43 -1:main│ │ ├─ Xms ERROR basic_verbose_exit hello -1:main│ │┌┘basic_verbose_exit::foomp 42 <- format string, normal_var=43 -1:main│ ├┘basic_verbose_exit::server host="localhost", port=8080 -1:main│ ├─┐basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms WARN basic_verbose_exit weak encryption requested, algo="xor" -1:main│ │ ├─ Xms DEBUG basic_verbose_exit response sent, length=8 -1:main│ │ ├─ Xms DEBUG basic_verbose_exit disconnected -1:main│ │┌┘basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381 -1:main│ ├┘basic_verbose_exit::server host="localhost", port=8080 -1:main│ ├─┐basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG basic_verbose_exit message received, length=5 -1:main│ │ ├─ Xms DEBUG basic_verbose_exit response sent, length=8 -1:main│ │ ├─ Xms DEBUG basic_verbose_exit disconnected -1:main│ │┌┘basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230 -1:main│ ├┘basic_verbose_exit::server host="localhost", port=8080 -1:main│ ├─ Xs WARN basic_verbose_exit internal error -1:main│ ├─ Xs ERROR basic_verbose_exit this is a log message -1:main│ ├─ Xs INFO basic_verbose_exit exit -1:main│┌┘basic_verbose_exit::server host="localhost", port=8080 -1:main├┘basic_verbose_exit::hierarchical-example version=0.1 +1:main└─┐basic_verbose_exit::server host="localhost", port=8080 +1:main ├─ Xms INFO basic_verbose_exit starting +1:main ├─ Xs INFO basic_verbose_exit listening +1:main └─┐basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms DEBUG basic_verbose_exit connected +1:main ├─ Xms DEBUG basic_verbose_exit message received, length=2 +1:main ┌┘basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381 +1:main ┌┘basic_verbose_exit::server host="localhost", port=8080 +1:main └─┐basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG basic_verbose_exit connected +1:main ┌┘basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230 +1:main ┌┘basic_verbose_exit::server host="localhost", port=8080 +1:main └─┐basic_verbose_exit::foomp 42 <- format string, normal_var=43 +1:main ├─ Xms ERROR basic_verbose_exit hello +1:main ┌┘basic_verbose_exit::foomp 42 <- format string, normal_var=43 +1:main ┌┘basic_verbose_exit::server host="localhost", port=8080 +1:main └─┐basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms WARN basic_verbose_exit weak encryption requested, algo="xor" +1:main ├─ Xms DEBUG basic_verbose_exit response sent, length=8 +1:main ├─ Xms DEBUG basic_verbose_exit disconnected +1:main ┌┘basic_verbose_exit::conn peer_addr="82.9.9.9", port=42381 +1:main ┌┘basic_verbose_exit::server host="localhost", port=8080 +1:main └─┐basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG basic_verbose_exit message received, length=5 +1:main ├─ Xms DEBUG basic_verbose_exit response sent, length=8 +1:main ├─ Xms DEBUG basic_verbose_exit disconnected +1:main ┌┘basic_verbose_exit::conn peer_addr="8.8.8.8", port=18230 +1:main ┌┘basic_verbose_exit::server host="localhost", port=8080 +1:main ├─ Xs WARN basic_verbose_exit internal error +1:main ├─ Xs ERROR basic_verbose_exit this is a log message +1:main ├─ Xs INFO basic_verbose_exit exit +1:main ┌┘basic_verbose_exit::server host="localhost", port=8080 +1:main┌┘basic_verbose_exit::hierarchical-example version=0.1 1:main┘basic_verbose_exit::hierarchical-example version=0.1 diff --git a/examples/concurrent.stdout b/examples/concurrent.stdout index 7ad1533..92cfe79 100644 --- a/examples/concurrent.stdout +++ b/examples/concurrent.stdout @@ -1,25 +1,25 @@ 1:main┐concurrent::hierarchical-example version=0.1 -1:main├───┐concurrent::server host="localhost", port=8080 -1:main│ ├─── Xms INFO concurrent starting -1:main│ ├─── Xs INFO concurrent listening -1:main│ ├─── Xs DEBUG concurrent starting countdowns -1:main│ ├───┐concurrent::countdowns -1:main│ │ ├───┐concurrent::countdown_a -1:main│ │ │ ├─── Xms DEBUG concurrent polling countdown, label="a", count=3 -1:main│ │ ├───┐concurrent::countdown_b -1:main│ │ │ ├─── Xms DEBUG concurrent polling countdown, label="b", count=5 -1:main│ │ │ ├─── Xms DEBUG concurrent polling countdown, label="b", count=4 -1:main│ │ ├───┐concurrent::countdown_a -1:main│ │ │ ├─── Xms DEBUG concurrent polling countdown, label="a", count=2 -1:main│ ├───┐concurrent::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─── Xms WARN concurrent peer1 warning -1:main│ ├───┐concurrent::countdowns -1:main│ │ ├─── Xms INFO concurrent finished polling countdowns -1:main│ │ ├───┘ -1:main│ │ ├───┘ -1:main│ ├───┘ -1:main│ ├───┘ -1:main│ ├─── Xs INFO concurrent all done! -1:main│ ├─── Xs INFO concurrent exit -1:main├───┘ +1:main└───┐concurrent::server host="localhost", port=8080 +1:main ├─── Xms INFO concurrent starting +1:main ├─── Xs INFO concurrent listening +1:main ├─── Xs DEBUG concurrent starting countdowns +1:main └───┐concurrent::countdowns +1:main └───┐concurrent::countdown_a +1:main ├─── Xms DEBUG concurrent polling countdown, label="a", count=3 +1:main └───┐concurrent::countdown_b +1:main ├─── Xms DEBUG concurrent polling countdown, label="b", count=5 +1:main ├─── Xms DEBUG concurrent polling countdown, label="b", count=4 +1:main └───┐concurrent::countdown_a +1:main ├─── Xms DEBUG concurrent polling countdown, label="a", count=2 +1:main └───┐concurrent::conn peer_addr="82.9.9.9", port=42381 +1:main ├─── Xms WARN concurrent peer1 warning +1:main └───┐concurrent::countdowns +1:main ├─── Xms INFO concurrent finished polling countdowns +1:main ┌───┘ +1:main ┌───┘ +1:main ┌───┘ +1:main ┌───┘ +1:main ├─── Xs INFO concurrent all done! +1:main ├─── Xs INFO concurrent exit +1:main┌───┘ 1:main┘ diff --git a/examples/concurrent_eager.stdout b/examples/concurrent_eager.stdout index dac84ac..a4551d0 100644 --- a/examples/concurrent_eager.stdout +++ b/examples/concurrent_eager.stdout @@ -1,16 +1,16 @@ 1:main┐concurrent_eager::spawn_fut key="a" 1:main┐concurrent_eager::spawn_fut key="b" 1:main┐concurrent_eager::spawn_fut key="a" -1:main├───┐concurrent_eager::a +1:main└───┐concurrent_eager::a 1:main┐concurrent_eager::spawn_fut key="b" -1:main├───┐concurrent_eager::b +1:main└───┐concurrent_eager::b 1:main┐concurrent_eager::spawn_fut key="a" -1:main├───┐concurrent_eager::a -1:main│ ├─── Xms INFO concurrent_eager a -1:main├───┘ +1:main└───┐concurrent_eager::a +1:main ├─── Xms INFO concurrent_eager a +1:main┌───┘ 1:main┐concurrent_eager::spawn_fut key="b" -1:main├───┐concurrent_eager::b -1:main│ ├─── Xms INFO concurrent_eager b -1:main├───┘ +1:main└───┐concurrent_eager::b +1:main ├─── Xms INFO concurrent_eager b +1:main┌───┘ 1:main┘ 1:main┘ diff --git a/examples/concurrent_verbose.stdout b/examples/concurrent_verbose.stdout index 73d1e57..8f1e3ce 100644 --- a/examples/concurrent_verbose.stdout +++ b/examples/concurrent_verbose.stdout @@ -1,35 +1,35 @@ 1:main┐concurrent_verbose::hierarchical-example version=0.1 -1:main├───┐concurrent_verbose::server host="localhost", port=8080 -1:main│ ├─── Xms INFO concurrent_verbose starting -1:main│ ├─── Xs INFO concurrent_verbose listening -1:main│ ├─── Xs DEBUG concurrent_verbose starting countdowns -1:main│ ├─┐concurrent_verbose::server host="localhost", port=8080 -1:main│ │ └─┐concurrent_verbose::countdowns -1:main│ │ ├───┐concurrent_verbose::countdown_a -1:main│ │ │ ├─── Xms DEBUG concurrent_verbose polling countdown, label="a", count=3 -1:main│ │ ├─┐concurrent_verbose::countdowns -1:main│ │ │ └─┐concurrent_verbose::countdown_b -1:main│ │ │ ├─── Xms DEBUG concurrent_verbose polling countdown, label="b", count=5 -1:main│ │ │ ├─── Xms DEBUG concurrent_verbose polling countdown, label="b", count=4 -1:main│ │ ├─┐concurrent_verbose::countdowns -1:main│ │ │ └─┐concurrent_verbose::countdown_a -1:main│ │ │ ├─── Xms DEBUG concurrent_verbose polling countdown, label="a", count=2 -1:main│ ├─┐concurrent_verbose::server host="localhost", port=8080 -1:main│ │ └─┐concurrent_verbose::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─── Xms WARN concurrent_verbose peer1 warning -1:main│ ├─┐concurrent_verbose::server host="localhost", port=8080 -1:main│ │ └─┐concurrent_verbose::countdowns -1:main│ │ ├─── Xms INFO concurrent_verbose finished polling countdowns -1:main│ │ │ ┌─┘concurrent_verbose::countdown_b -1:main│ │ ├─┘concurrent_verbose::countdowns -1:main│ │ │ ┌─┘concurrent_verbose::countdown_a -1:main│ │ ├─┘concurrent_verbose::countdowns -1:main│ │ ┌─┘concurrent_verbose::countdowns -1:main│ ├─┘concurrent_verbose::server host="localhost", port=8080 -1:main│ │ ┌─┘concurrent_verbose::conn peer_addr="82.9.9.9", port=42381 -1:main│ ├─┘concurrent_verbose::server host="localhost", port=8080 -1:main│ ├─── Xs INFO concurrent_verbose all done! -1:main│ ├─── Xs INFO concurrent_verbose exit -1:main│ ┌─┘concurrent_verbose::server host="localhost", port=8080 -1:main├─┘concurrent_verbose::hierarchical-example version=0.1 +1:main└───┐concurrent_verbose::server host="localhost", port=8080 +1:main ├─── Xms INFO concurrent_verbose starting +1:main ├─── Xs INFO concurrent_verbose listening +1:main ├─── Xs DEBUG concurrent_verbose starting countdowns +1:main └─┐concurrent_verbose::server host="localhost", port=8080 +1:main └─┐concurrent_verbose::countdowns +1:main └───┐concurrent_verbose::countdown_a +1:main ├─── Xms DEBUG concurrent_verbose polling countdown, label="a", count=3 +1:main └─┐concurrent_verbose::countdowns +1:main └─┐concurrent_verbose::countdown_b +1:main ├─── Xms DEBUG concurrent_verbose polling countdown, label="b", count=5 +1:main ├─── Xms DEBUG concurrent_verbose polling countdown, label="b", count=4 +1:main └─┐concurrent_verbose::countdowns +1:main └─┐concurrent_verbose::countdown_a +1:main ├─── Xms DEBUG concurrent_verbose polling countdown, label="a", count=2 +1:main └─┐concurrent_verbose::server host="localhost", port=8080 +1:main └─┐concurrent_verbose::conn peer_addr="82.9.9.9", port=42381 +1:main ├─── Xms WARN concurrent_verbose peer1 warning +1:main └─┐concurrent_verbose::server host="localhost", port=8080 +1:main └─┐concurrent_verbose::countdowns +1:main ├─── Xms INFO concurrent_verbose finished polling countdowns +1:main ┌─┘concurrent_verbose::countdown_b +1:main ┌─┘concurrent_verbose::countdowns +1:main ┌─┘concurrent_verbose::countdown_a +1:main ┌─┘concurrent_verbose::countdowns +1:main ┌─┘concurrent_verbose::countdowns +1:main ┌─┘concurrent_verbose::server host="localhost", port=8080 +1:main ┌─┘concurrent_verbose::conn peer_addr="82.9.9.9", port=42381 +1:main ┌─┘concurrent_verbose::server host="localhost", port=8080 +1:main ├─── Xs INFO concurrent_verbose all done! +1:main ├─── Xs INFO concurrent_verbose exit +1:main ┌─┘concurrent_verbose::server host="localhost", port=8080 +1:main┌─┘concurrent_verbose::hierarchical-example version=0.1 1:main┘concurrent_verbose::hierarchical-example version=0.1 diff --git a/examples/deferred.stdout b/examples/deferred.stdout index e2fc729..90c17e2 100644 --- a/examples/deferred.stdout +++ b/examples/deferred.stdout @@ -1,45 +1,45 @@ -> This prints before the span open message 1:main┐open: deferred::hierarchical-example version=0.1 -1:main├─┐open: deferred::server host="localhost", port=8080 -1:main│ ├─ Xms INFO deferred starting -1:main│ ├─ Xs INFO deferred listening +1:main└─┐open: deferred::server host="localhost", port=8080 +1:main ├─ Xms INFO deferred starting +1:main ├─ Xs INFO deferred listening -> Deferring two levels of spans -1:main│ ├┐pre_open: deferred::server host="localhost", port=8080 -1:main│ │└┐open(v): deferred::connections -1:main│ │ ├─┐open: deferred::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ │ ├─ Xms DEBUG deferred connected, peer="peer1" -1:main│ │ │ ├─ Xms DEBUG deferred message received, length=2 -1:main│ │ │┌┘close(v): deferred::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├┘post_close: deferred::connections -1:main│ │ ├┐pre_open: deferred::connections -1:main│ │ │└┐open(v): deferred::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ │ ├─ Xms DEBUG deferred connected, peer="peer3" -1:main│ │ │┌┘close(v): deferred::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├┘post_close: deferred::connections -1:main│ │ ├┐pre_open: deferred::connections -1:main│ │ │└┐open(v): deferred::foomp 42 <- format string, normal_var=43 -1:main│ │ │ ├─ Xms ERROR deferred hello -1:main│ │ │┌┘close(v): deferred::foomp 42 <- format string, normal_var=43 -1:main│ │ ├┘post_close: deferred::connections -1:main│ │ ├┐pre_open: deferred::connections -1:main│ │ │└┐open(v): deferred::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ │ ├─ Xms WARN deferred weak encryption requested, algo="xor" -1:main│ │ │ ├─ Xms DEBUG deferred response sent, length=8 -1:main│ │ │ ├─ Xms DEBUG deferred disconnected -1:main│ │ │┌┘close(v): deferred::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├┘post_close: deferred::connections -1:main│ │ ├┐pre_open: deferred::connections -1:main│ │ │└┐open(v): deferred::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ │ ├─ Xms DEBUG deferred message received, length=5 -1:main│ │ │ ├─ Xms DEBUG deferred response sent, length=8 -1:main│ │ │ ├─ Xms DEBUG deferred disconnected -1:main│ │ │┌┘close(v): deferred::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├┘post_close: deferred::connections -1:main│ │┌┘close(v): deferred::connections -1:main│ ├┘post_close: deferred::server host="localhost", port=8080 -1:main│ ├─ Xs WARN deferred internal error -1:main│ ├─ Xs ERROR deferred this is a log message -1:main│ ├─ Xs INFO deferred exit -1:main│┌┘close(v): deferred::server host="localhost", port=8080 -1:main├┘post_close: deferred::hierarchical-example version=0.1 +1:main └┐pre_open: deferred::server host="localhost", port=8080 +1:main └┐open(v): deferred::connections +1:main └─┐open: deferred::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms DEBUG deferred connected, peer="peer1" +1:main ├─ Xms DEBUG deferred message received, length=2 +1:main ┌┘close(v): deferred::conn peer_addr="82.9.9.9", port=42381 +1:main ┌┘post_close: deferred::connections +1:main └┐pre_open: deferred::connections +1:main └┐open(v): deferred::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG deferred connected, peer="peer3" +1:main ┌┘close(v): deferred::conn peer_addr="8.8.8.8", port=18230 +1:main ┌┘post_close: deferred::connections +1:main └┐pre_open: deferred::connections +1:main └┐open(v): deferred::foomp 42 <- format string, normal_var=43 +1:main ├─ Xms ERROR deferred hello +1:main ┌┘close(v): deferred::foomp 42 <- format string, normal_var=43 +1:main ┌┘post_close: deferred::connections +1:main └┐pre_open: deferred::connections +1:main └┐open(v): deferred::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms WARN deferred weak encryption requested, algo="xor" +1:main ├─ Xms DEBUG deferred response sent, length=8 +1:main ├─ Xms DEBUG deferred disconnected +1:main ┌┘close(v): deferred::conn peer_addr="82.9.9.9", port=42381 +1:main ┌┘post_close: deferred::connections +1:main └┐pre_open: deferred::connections +1:main └┐open(v): deferred::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG deferred message received, length=5 +1:main ├─ Xms DEBUG deferred response sent, length=8 +1:main ├─ Xms DEBUG deferred disconnected +1:main ┌┘close(v): deferred::conn peer_addr="8.8.8.8", port=18230 +1:main ┌┘post_close: deferred::connections +1:main ┌┘close(v): deferred::connections +1:main ┌┘post_close: deferred::server host="localhost", port=8080 +1:main ├─ Xs WARN deferred internal error +1:main ├─ Xs ERROR deferred this is a log message +1:main ├─ Xs INFO deferred exit +1:main ┌┘close(v): deferred::server host="localhost", port=8080 +1:main┌┘post_close: deferred::hierarchical-example version=0.1 1:main┘close(v): deferred::hierarchical-example version=0.1 diff --git a/examples/quiet.stdout b/examples/quiet.stdout index 52160cb..f6610bf 100644 --- a/examples/quiet.stdout +++ b/examples/quiet.stdout @@ -1,28 +1,28 @@ 1:main┐quiet::hierarchical-example version=0.1 -1:main├─┐quiet::server host="localhost", port=8080 -1:main│ ├─ Xms INFO quiet starting -1:main│ ├─ Xms INFO quiet listening -1:main│ ├─┐quiet::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms DEBUG quiet connected -1:main│ │ ├─ Xms DEBUG quiet message received, length=2 -1:main│ ├─┘ -1:main│ ├─┐quiet::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG quiet connected -1:main│ ├─┘ -1:main│ ├─┐quiet::foomp 42 <- format string, normal_var=43 -1:main│ │ ├─ Xms ERROR quiet hello -1:main│ ├─┘ -1:main│ ├─┐quiet::conn peer_addr="82.9.9.9", port=42381 -1:main│ │ ├─ Xms WARN quiet weak encryption requested, algo="xor" -1:main│ │ ├─ Xms DEBUG quiet response sent, length=8 -1:main│ │ ├─ Xms DEBUG quiet disconnected -1:main│ ├─┘ -1:main│ ├─┐quiet::conn peer_addr="8.8.8.8", port=18230 -1:main│ │ ├─ Xms DEBUG quiet message received, length=5 -1:main│ │ ├─ Xms DEBUG quiet response sent, length=8 -1:main│ │ ├─ Xms DEBUG quiet disconnected -1:main│ ├─┘ -1:main│ ├─ Xs WARN quiet internal error -1:main│ ├─ Xs INFO quiet exit -1:main├─┘ +1:main└─┐quiet::server host="localhost", port=8080 +1:main ├─ Xms INFO quiet starting +1:main ├─ Xms INFO quiet listening +1:main └─┐quiet::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms DEBUG quiet connected +1:main ├─ Xms DEBUG quiet message received, length=2 +1:main ┌─┘ +1:main └─┐quiet::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG quiet connected +1:main ┌─┘ +1:main └─┐quiet::foomp 42 <- format string, normal_var=43 +1:main ├─ Xms ERROR quiet hello +1:main ┌─┘ +1:main └─┐quiet::conn peer_addr="82.9.9.9", port=42381 +1:main ├─ Xms WARN quiet weak encryption requested, algo="xor" +1:main ├─ Xms DEBUG quiet response sent, length=8 +1:main ├─ Xms DEBUG quiet disconnected +1:main ┌─┘ +1:main └─┐quiet::conn peer_addr="8.8.8.8", port=18230 +1:main ├─ Xms DEBUG quiet message received, length=5 +1:main ├─ Xms DEBUG quiet response sent, length=8 +1:main ├─ Xms DEBUG quiet disconnected +1:main ┌─┘ +1:main ├─ Xs WARN quiet internal error +1:main ├─ Xs INFO quiet exit +1:main┌─┘ 1:main┘ diff --git a/examples/stderr.stderr b/examples/stderr.stderr index c1c242f..03d7c5c 100644 --- a/examples/stderr.stderr +++ b/examples/stderr.stderr @@ -1,111 +1,111 @@ ┐fibonacci_seq{to=5} ├─ Xms DEBUG Pushing 0 fibonacci -├─┐nth_fibonacci{n=0} -│ ├─ Xms DEBUG Base case -├─┘ +└─┐nth_fibonacci{n=0} + ├─ Xms DEBUG Base case +┌─┘ ├─ Xms DEBUG Pushing 1 fibonacci -├─┐nth_fibonacci{n=1} -│ ├─ Xms DEBUG Base case -├─┘ +└─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case +┌─┘ ├─ Xms DEBUG Pushing 2 fibonacci -├─┐nth_fibonacci{n=2} -│ ├─ Xms DEBUG Recursing -│ ├─┐nth_fibonacci{n=1} -│ │ ├─ Xms DEBUG Base case -│ ├─┘ -│ ├─┐nth_fibonacci{n=0} -│ │ ├─ Xms DEBUG Base case -│ ├─┘ -├─┘ +└─┐nth_fibonacci{n=2} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + └─┐nth_fibonacci{n=0} + ├─ Xms DEBUG Base case + ┌─┘ +┌─┘ ├─ Xms DEBUG Pushing 3 fibonacci -├─┐nth_fibonacci{n=3} -│ ├─ Xms DEBUG Recursing -│ ├─┐nth_fibonacci{n=2} -│ │ ├─ Xms DEBUG Recursing -│ │ ├─┐nth_fibonacci{n=1} -│ │ │ ├─ Xms DEBUG Base case -│ │ ├─┘ -│ │ ├─┐nth_fibonacci{n=0} -│ │ │ ├─ Xms DEBUG Base case -│ │ ├─┘ -│ ├─┘ -│ ├─┐nth_fibonacci{n=1} -│ │ ├─ Xms DEBUG Base case -│ ├─┘ -├─┘ +└─┐nth_fibonacci{n=3} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=2} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + └─┐nth_fibonacci{n=0} + ├─ Xms DEBUG Base case + ┌─┘ + ┌─┘ + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ +┌─┘ ├─ Xms DEBUG Pushing 4 fibonacci -├─┐nth_fibonacci{n=4} -│ ├─ Xms DEBUG Recursing -│ ├─┐nth_fibonacci{n=3} -│ │ ├─ Xms DEBUG Recursing -│ │ ├─┐nth_fibonacci{n=2} -│ │ │ ├─ Xms DEBUG Recursing -│ │ │ ├─┐nth_fibonacci{n=1} -│ │ │ │ ├─ Xms DEBUG Base case -│ │ │ ├─┘ -│ │ │ ├─┐nth_fibonacci{n=0} -│ │ │ │ ├─ Xms DEBUG Base case -│ │ │ ├─┘ -│ │ ├─┘ -│ │ ├─┐nth_fibonacci{n=1} -│ │ │ ├─ Xms DEBUG Base case -│ │ ├─┘ -│ ├─┘ -│ ├─┐nth_fibonacci{n=2} -│ │ ├─ Xms DEBUG Recursing -│ │ ├─┐nth_fibonacci{n=1} -│ │ │ ├─ Xms DEBUG Base case -│ │ ├─┘ -│ │ ├─┐nth_fibonacci{n=0} -│ │ │ ├─ Xms DEBUG Base case -│ │ ├─┘ -│ ├─┘ -├─┘ +└─┐nth_fibonacci{n=4} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=3} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=2} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + └─┐nth_fibonacci{n=0} + ├─ Xms DEBUG Base case + ┌─┘ + ┌─┘ + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + ┌─┘ + └─┐nth_fibonacci{n=2} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + └─┐nth_fibonacci{n=0} + ├─ Xms DEBUG Base case + ┌─┘ + ┌─┘ +┌─┘ ├─ Xms DEBUG Pushing 5 fibonacci -├─┐nth_fibonacci{n=5} -│ ├─ Xms DEBUG Recursing -│ ├─┐nth_fibonacci{n=4} -│ │ ├─ Xms DEBUG Recursing -│ │ ├─┐nth_fibonacci{n=3} -│ │ │ ├─ Xms DEBUG Recursing -│ │ │ ├─┐nth_fibonacci{n=2} -│ │ │ │ ├─ Xms DEBUG Recursing -│ │ │ │ ├─┐nth_fibonacci{n=1} -│ │ │ │ │ ├─ Xms DEBUG Base case -│ │ │ │ ├─┘ -│ │ │ │ ├─┐nth_fibonacci{n=0} -│ │ │ │ │ ├─ Xms DEBUG Base case -│ │ │ │ ├─┘ -│ │ │ ├─┘ -│ │ │ ├─┐nth_fibonacci{n=1} -│ │ │ │ ├─ Xms DEBUG Base case -│ │ │ ├─┘ -│ │ ├─┘ -│ │ ├─┐nth_fibonacci{n=2} -│ │ │ ├─ Xms DEBUG Recursing -│ │ │ ├─┐nth_fibonacci{n=1} -│ │ │ │ ├─ Xms DEBUG Base case -│ │ │ ├─┘ -│ │ │ ├─┐nth_fibonacci{n=0} -│ │ │ │ ├─ Xms DEBUG Base case -│ │ │ ├─┘ -│ │ ├─┘ -│ ├─┘ -│ ├─┐nth_fibonacci{n=3} -│ │ ├─ Xms DEBUG Recursing -│ │ ├─┐nth_fibonacci{n=2} -│ │ │ ├─ Xms DEBUG Recursing -│ │ │ ├─┐nth_fibonacci{n=1} -│ │ │ │ ├─ Xms DEBUG Base case -│ │ │ ├─┘ -│ │ │ ├─┐nth_fibonacci{n=0} -│ │ │ │ ├─ Xms DEBUG Base case -│ │ │ ├─┘ -│ │ ├─┘ -│ │ ├─┐nth_fibonacci{n=1} -│ │ │ ├─ Xms DEBUG Base case -│ │ ├─┘ -│ ├─┘ -├─┘ +└─┐nth_fibonacci{n=5} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=4} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=3} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=2} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + └─┐nth_fibonacci{n=0} + ├─ Xms DEBUG Base case + ┌─┘ + ┌─┘ + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + ┌─┘ + └─┐nth_fibonacci{n=2} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + └─┐nth_fibonacci{n=0} + ├─ Xms DEBUG Base case + ┌─┘ + ┌─┘ + ┌─┘ + └─┐nth_fibonacci{n=3} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=2} + ├─ Xms DEBUG Recursing + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + └─┐nth_fibonacci{n=0} + ├─ Xms DEBUG Base case + ┌─┘ + ┌─┘ + └─┐nth_fibonacci{n=1} + ├─ Xms DEBUG Base case + ┌─┘ + ┌─┘ +┌─┘ ┘ INFO The first 5 fibonacci numbers are [1, 1, 2, 3, 5, 8] diff --git a/examples/wraparound.stdout b/examples/wraparound.stdout index 47022e0..e254eae 100644 --- a/examples/wraparound.stdout +++ b/examples/wraparound.stdout @@ -1,96 +1,96 @@ 1:main┐wraparound::recurse i=0 1:main├─ Xms WARN wraparound boop -1:main├─┐wraparound::recurse i=1 -1:main│ ├─ Xms WARN wraparound boop -1:main│ ├─┐wraparound::recurse i=2 -1:main│ │ ├─ Xms WARN wraparound boop -1:main│ │ ├─┐wraparound::recurse i=3 -1:main│ │ │ ├─ Xms WARN wraparound boop -1:main│ │ │ ├─┐wraparound::recurse i=4 +1:main└─┐wraparound::recurse i=1 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=2 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=3 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=4 1:main────────┘ 1:main Xms WARN wraparound boop 1:main┐wraparound::recurse i=5 1:main├─ Xms WARN wraparound boop -1:main├─┐wraparound::recurse i=6 -1:main│ ├─ Xms WARN wraparound boop -1:main│ ├─┐wraparound::recurse i=7 -1:main│ │ ├─ Xms WARN wraparound boop -1:main│ │ ├─┐wraparound::recurse i=8 -1:main│ │ │ ├─ Xms WARN wraparound boop -1:main│ │ │ ├─┐wraparound::recurse i=9 +1:main└─┐wraparound::recurse i=6 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=7 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=8 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=9 1:main────────┘ 1:main Xms WARN wraparound boop 1:main┐wraparound::recurse i=10 1:main├─ Xms WARN wraparound boop -1:main├─┐wraparound::recurse i=11 -1:main│ ├─ Xms WARN wraparound boop -1:main│ ├─┐wraparound::recurse i=12 -1:main│ │ ├─ Xms WARN wraparound boop -1:main│ │ ├─┐wraparound::recurse i=13 -1:main│ │ │ ├─ Xms WARN wraparound boop -1:main│ │ │ ├─┐wraparound::recurse i=14 +1:main└─┐wraparound::recurse i=11 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=12 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=13 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=14 1:main────────┘ 1:main Xms WARN wraparound boop 1:main┐wraparound::recurse i=15 1:main├─ Xms WARN wraparound boop -1:main├─┐wraparound::recurse i=16 -1:main│ ├─ Xms WARN wraparound boop -1:main│ ├─┐wraparound::recurse i=17 -1:main│ │ ├─ Xms WARN wraparound boop -1:main│ │ ├─┐wraparound::recurse i=18 -1:main│ │ │ ├─ Xms WARN wraparound boop -1:main│ │ │ ├─┐wraparound::recurse i=19 +1:main└─┐wraparound::recurse i=16 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=17 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=18 +1:main ├─ Xms WARN wraparound boop +1:main └─┐wraparound::recurse i=19 1:main────────┘ 1:main Xms WARN wraparound boop 1:main┐wraparound::recurse i=20 1:main├─ Xms WARN wraparound boop -1:main├─┐wraparound::recurse i=21 -1:main│ ├─ Xms WARN wraparound boop -1:main│ ├─ Xms WARN wraparound bop -1:main├─┘ +1:main└─┐wraparound::recurse i=21 +1:main ├─ Xms WARN wraparound boop +1:main ├─ Xms WARN wraparound bop +1:main┌─┘ 1:main├─ Xms WARN wraparound bop 1:main┘ 1:main Xms WARN wraparound bop 1:main────────┐ -1:main│ │ │ ├─┘ -1:main│ │ │ ├─ Xms WARN wraparound bop -1:main│ │ ├─┘ -1:main│ │ ├─ Xms WARN wraparound bop -1:main│ ├─┘ -1:main│ ├─ Xms WARN wraparound bop -1:main├─┘ +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main┌─┘ 1:main├─ Xms WARN wraparound bop 1:main┘ 1:main Xms WARN wraparound bop 1:main────────┐ -1:main│ │ │ ├─┘ -1:main│ │ │ ├─ Xms WARN wraparound bop -1:main│ │ ├─┘ -1:main│ │ ├─ Xms WARN wraparound bop -1:main│ ├─┘ -1:main│ ├─ Xms WARN wraparound bop -1:main├─┘ +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main┌─┘ 1:main├─ Xms WARN wraparound bop 1:main┘ 1:main Xms WARN wraparound bop 1:main────────┐ -1:main│ │ │ ├─┘ -1:main│ │ │ ├─ Xms WARN wraparound bop -1:main│ │ ├─┘ -1:main│ │ ├─ Xms WARN wraparound bop -1:main│ ├─┘ -1:main│ ├─ Xms WARN wraparound bop -1:main├─┘ +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main┌─┘ 1:main├─ Xms WARN wraparound bop 1:main┘ 1:main Xms WARN wraparound bop 1:main────────┐ -1:main│ │ │ ├─┘ -1:main│ │ │ ├─ Xms WARN wraparound bop -1:main│ │ ├─┘ -1:main│ │ ├─ Xms WARN wraparound bop -1:main│ ├─┘ -1:main│ ├─ Xms WARN wraparound bop -1:main├─┘ +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main ┌─┘ +1:main ├─ Xms WARN wraparound bop +1:main┌─┘ 1:main├─ Xms WARN wraparound bop 1:main┘ diff --git a/src/format.rs b/src/format.rs index 176faf6..1ab6786 100644 --- a/src/format.rs +++ b/src/format.rs @@ -12,7 +12,9 @@ pub(crate) const LINE_VERT: &str = "│"; const LINE_HORIZ: &str = "─"; pub(crate) const LINE_BRANCH: &str = "├"; pub(crate) const LINE_CLOSE: &str = "┘"; +pub(crate) const LINE_CLOSE2: char = '┌'; pub(crate) const LINE_OPEN: &str = "┐"; +pub(crate) const LINE_OPEN2: char = '└'; #[derive(Debug, Copy, Clone)] pub(crate) enum SpanMode { @@ -368,14 +370,8 @@ fn indent_block_with_lines( let mut s = String::with_capacity(indent_spaces + prefix.len()); s.push_str(prefix); - // instead of using all spaces to indent, draw a vertical line at every indent level - // up until the last indent - for i in 0..(indent_spaces - indent_amount) { - if i % indent_amount == 0 { - s.push_str(LINE_VERT); - } else { - s.push(' '); - } + for _ in 0..(indent_spaces - indent_amount) { + s.push(' '); } // draw branch @@ -383,27 +379,27 @@ fn indent_block_with_lines( match style { SpanMode::PreOpen => { - buf.push_str(LINE_BRANCH); + buf.push(LINE_OPEN2); for _ in 1..(indent_amount / 2) { buf.push_str(LINE_HORIZ); } buf.push_str(LINE_OPEN); } SpanMode::Open { verbose: false } | SpanMode::Retrace { verbose: false } => { - buf.push_str(LINE_BRANCH); + buf.push(LINE_OPEN2); for _ in 1..indent_amount { buf.push_str(LINE_HORIZ); } buf.push_str(LINE_OPEN); } SpanMode::Open { verbose: true } | SpanMode::Retrace { verbose: true } => { - buf.push_str(LINE_VERT); + buf.push(' '); for _ in 1..(indent_amount / 2) { buf.push(' '); } // We don't have the space for fancy rendering at single space indent. if indent_amount > 1 { - buf.push('└'); + buf.push(LINE_OPEN2); } for _ in (indent_amount / 2)..(indent_amount - 1) { buf.push_str(LINE_HORIZ); @@ -412,24 +408,24 @@ fn indent_block_with_lines( if indent_amount > 1 { buf.push_str(LINE_OPEN); } else { - buf.push_str(LINE_VERT); + buf.push(' '); } } SpanMode::Close { verbose: false } => { - buf.push_str(LINE_BRANCH); + buf.push(LINE_CLOSE2); for _ in 1..indent_amount { buf.push_str(LINE_HORIZ); } buf.push_str(LINE_CLOSE); } SpanMode::Close { verbose: true } => { - buf.push_str(LINE_VERT); + buf.push(' '); for _ in 1..(indent_amount / 2) { buf.push(' '); } // We don't have the space for fancy rendering at single space indent. if indent_amount > 1 { - buf.push('┌'); + buf.push(LINE_CLOSE2); } for _ in (indent_amount / 2)..(indent_amount - 1) { buf.push_str(LINE_HORIZ); @@ -438,11 +434,11 @@ fn indent_block_with_lines( if indent_amount > 1 { buf.push_str(LINE_CLOSE); } else { - buf.push_str(LINE_VERT); + buf.push(' '); } } SpanMode::PostClose => { - buf.push_str(LINE_BRANCH); + buf.push(LINE_CLOSE2); for _ in 1..(indent_amount / 2) { buf.push_str(LINE_HORIZ); }