Skip to content

Commit c846f7c

Browse files
committed
Replace tracing_forest with custom span formatting
1 parent 3a115ba commit c846f7c

File tree

3 files changed

+338
-44
lines changed

3 files changed

+338
-44
lines changed

src/bootstrap/Cargo.lock

Lines changed: 150 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@ dependencies = [
1212
]
1313

1414
[[package]]
15-
name = "ansi_term"
16-
version = "0.12.1"
15+
name = "android-tzdata"
16+
version = "0.1.1"
17+
source = "registry+https://github.com/rust-lang/crates.io-index"
18+
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
19+
20+
[[package]]
21+
name = "android_system_properties"
22+
version = "0.1.5"
1723
source = "registry+https://github.com/rust-lang/crates.io-index"
18-
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
24+
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
1925
dependencies = [
20-
"winapi",
26+
"libc",
2127
]
2228

2329
[[package]]
@@ -26,6 +32,12 @@ version = "1.0.10"
2632
source = "registry+https://github.com/rust-lang/crates.io-index"
2733
checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
2834

35+
[[package]]
36+
name = "autocfg"
37+
version = "1.5.0"
38+
source = "registry+https://github.com/rust-lang/crates.io-index"
39+
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
40+
2941
[[package]]
3042
name = "bitflags"
3143
version = "2.6.0"
@@ -47,6 +59,7 @@ version = "0.0.0"
4759
dependencies = [
4860
"build_helper",
4961
"cc",
62+
"chrono",
5063
"clap",
5164
"clap_complete",
5265
"cmake",
@@ -71,7 +84,6 @@ dependencies = [
7184
"toml",
7285
"tracing",
7386
"tracing-chrome",
74-
"tracing-forest",
7587
"tracing-subscriber",
7688
"walkdir",
7789
"windows",
@@ -97,6 +109,12 @@ dependencies = [
97109
"serde_derive",
98110
]
99111

112+
[[package]]
113+
name = "bumpalo"
114+
version = "3.19.0"
115+
source = "registry+https://github.com/rust-lang/crates.io-index"
116+
checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
117+
100118
[[package]]
101119
name = "cc"
102120
version = "1.2.23"
@@ -112,6 +130,20 @@ version = "1.0.0"
112130
source = "registry+https://github.com/rust-lang/crates.io-index"
113131
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
114132

133+
[[package]]
134+
name = "chrono"
135+
version = "0.4.41"
136+
source = "registry+https://github.com/rust-lang/crates.io-index"
137+
checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
138+
dependencies = [
139+
"android-tzdata",
140+
"iana-time-zone",
141+
"js-sys",
142+
"num-traits",
143+
"wasm-bindgen",
144+
"windows-link",
145+
]
146+
115147
[[package]]
116148
name = "clap"
117149
version = "4.5.20"
@@ -180,6 +212,12 @@ dependencies = [
180212
"windows-sys 0.59.0",
181213
]
182214

215+
[[package]]
216+
name = "core-foundation-sys"
217+
version = "0.8.7"
218+
source = "registry+https://github.com/rust-lang/crates.io-index"
219+
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
220+
183221
[[package]]
184222
name = "cpufeatures"
185223
version = "0.2.15"
@@ -335,6 +373,30 @@ dependencies = [
335373
"windows-sys 0.52.0",
336374
]
337375

376+
[[package]]
377+
name = "iana-time-zone"
378+
version = "0.1.63"
379+
source = "registry+https://github.com/rust-lang/crates.io-index"
380+
checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
381+
dependencies = [
382+
"android_system_properties",
383+
"core-foundation-sys",
384+
"iana-time-zone-haiku",
385+
"js-sys",
386+
"log",
387+
"wasm-bindgen",
388+
"windows-core",
389+
]
390+
391+
[[package]]
392+
name = "iana-time-zone-haiku"
393+
version = "0.1.2"
394+
source = "registry+https://github.com/rust-lang/crates.io-index"
395+
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
396+
dependencies = [
397+
"cc",
398+
]
399+
338400
[[package]]
339401
name = "ignore"
340402
version = "0.4.23"
@@ -368,6 +430,16 @@ version = "1.0.11"
368430
source = "registry+https://github.com/rust-lang/crates.io-index"
369431
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
370432

433+
[[package]]
434+
name = "js-sys"
435+
version = "0.3.77"
436+
source = "registry+https://github.com/rust-lang/crates.io-index"
437+
checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
438+
dependencies = [
439+
"once_cell",
440+
"wasm-bindgen",
441+
]
442+
371443
[[package]]
372444
name = "junction"
373445
version = "1.2.0"
@@ -458,6 +530,15 @@ dependencies = [
458530
"winapi",
459531
]
460532

533+
[[package]]
534+
name = "num-traits"
535+
version = "0.2.19"
536+
source = "registry+https://github.com/rust-lang/crates.io-index"
537+
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
538+
dependencies = [
539+
"autocfg",
540+
]
541+
461542
[[package]]
462543
name = "objc2-core-foundation"
463544
version = "0.3.1"
@@ -620,6 +701,12 @@ dependencies = [
620701
"windows-sys 0.59.0",
621702
]
622703

704+
[[package]]
705+
name = "rustversion"
706+
version = "1.0.22"
707+
source = "registry+https://github.com/rust-lang/crates.io-index"
708+
checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
709+
623710
[[package]]
624711
name = "ryu"
625712
version = "1.0.18"
@@ -775,26 +862,6 @@ dependencies = [
775862
"winapi-util",
776863
]
777864

778-
[[package]]
779-
name = "thiserror"
780-
version = "1.0.69"
781-
source = "registry+https://github.com/rust-lang/crates.io-index"
782-
checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
783-
dependencies = [
784-
"thiserror-impl",
785-
]
786-
787-
[[package]]
788-
name = "thiserror-impl"
789-
version = "1.0.69"
790-
source = "registry+https://github.com/rust-lang/crates.io-index"
791-
checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
792-
dependencies = [
793-
"proc-macro2",
794-
"quote",
795-
"syn",
796-
]
797-
798865
[[package]]
799866
name = "thread_local"
800867
version = "1.1.8"
@@ -857,19 +924,6 @@ dependencies = [
857924
"valuable",
858925
]
859926

860-
[[package]]
861-
name = "tracing-forest"
862-
version = "0.1.6"
863-
source = "registry+https://github.com/rust-lang/crates.io-index"
864-
checksum = "ee40835db14ddd1e3ba414292272eddde9dad04d3d4b65509656414d1c42592f"
865-
dependencies = [
866-
"ansi_term",
867-
"smallvec",
868-
"thiserror",
869-
"tracing",
870-
"tracing-subscriber",
871-
]
872-
873927
[[package]]
874928
name = "tracing-log"
875929
version = "0.2.0"
@@ -942,6 +996,64 @@ dependencies = [
942996
"wit-bindgen-rt",
943997
]
944998

999+
[[package]]
1000+
name = "wasm-bindgen"
1001+
version = "0.2.100"
1002+
source = "registry+https://github.com/rust-lang/crates.io-index"
1003+
checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
1004+
dependencies = [
1005+
"cfg-if",
1006+
"once_cell",
1007+
"rustversion",
1008+
"wasm-bindgen-macro",
1009+
]
1010+
1011+
[[package]]
1012+
name = "wasm-bindgen-backend"
1013+
version = "0.2.100"
1014+
source = "registry+https://github.com/rust-lang/crates.io-index"
1015+
checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
1016+
dependencies = [
1017+
"bumpalo",
1018+
"log",
1019+
"proc-macro2",
1020+
"quote",
1021+
"syn",
1022+
"wasm-bindgen-shared",
1023+
]
1024+
1025+
[[package]]
1026+
name = "wasm-bindgen-macro"
1027+
version = "0.2.100"
1028+
source = "registry+https://github.com/rust-lang/crates.io-index"
1029+
checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
1030+
dependencies = [
1031+
"quote",
1032+
"wasm-bindgen-macro-support",
1033+
]
1034+
1035+
[[package]]
1036+
name = "wasm-bindgen-macro-support"
1037+
version = "0.2.100"
1038+
source = "registry+https://github.com/rust-lang/crates.io-index"
1039+
checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
1040+
dependencies = [
1041+
"proc-macro2",
1042+
"quote",
1043+
"syn",
1044+
"wasm-bindgen-backend",
1045+
"wasm-bindgen-shared",
1046+
]
1047+
1048+
[[package]]
1049+
name = "wasm-bindgen-shared"
1050+
version = "0.2.100"
1051+
source = "registry+https://github.com/rust-lang/crates.io-index"
1052+
checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
1053+
dependencies = [
1054+
"unicode-ident",
1055+
]
1056+
9451057
[[package]]
9461058
name = "winapi"
9471059
version = "0.3.9"

src/bootstrap/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ default-run = "bootstrap"
77

88
[features]
99
build-metrics = ["sysinfo"]
10-
tracing = ["dep:tracing", "dep:tracing-chrome", "dep:tracing-subscriber", "dep:tracing-forest", "dep:tempfile"]
10+
tracing = ["dep:tracing", "dep:tracing-chrome", "dep:tracing-subscriber", "dep:chrono", "dep:tempfile"]
1111

1212
[lib]
1313
path = "src/lib.rs"
@@ -61,10 +61,10 @@ xz2 = "0.1"
6161
sysinfo = { version = "0.36.0", default-features = false, optional = true, features = ["system"] }
6262

6363
# Dependencies needed by the `tracing` feature
64+
chrono = { version = "0.4", optional = true }
6465
tracing = { version = "0.1", optional = true, features = ["attributes"] }
6566
tracing-chrome = { version = "0.7", optional = true }
6667
tracing-subscriber = { version = "0.3", optional = true, features = ["env-filter", "fmt", "registry", "std"] }
67-
tracing-forest = { version = "0.1.6", optional = true, default-features = false, features = ["smallvec", "ansi", "env-filter"] }
6868
tempfile = { version = "3.15.0", optional = true }
6969

7070
[target.'cfg(windows)'.dependencies.junction]

0 commit comments

Comments
 (0)