Skip to content

Commit 211fd7e

Browse files
committed
Auto merge of #12458 - weihanglo:tracing, r=epage
refactor: migrate to `tracing`
2 parents 27e73b3 + 964c083 commit 211fd7e

Some content is hidden

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

63 files changed

+300
-185
lines changed

Cargo.lock

Lines changed: 116 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ crates-io = { version = "0.38.0", path = "crates/crates-io" }
3434
criterion = { version = "0.5.1", features = ["html_reports"] }
3535
curl = "0.4.44"
3636
curl-sys = "0.4.65"
37-
env_logger = "0.10.0"
3837
filetime = "0.2.21"
3938
flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }
4039
fwdansi = "1.1.0"
@@ -58,7 +57,6 @@ lazy_static = "1.4.0"
5857
lazycell = "1.3.0"
5958
libc = "0.2.147"
6059
libgit2-sys = "0.15.2"
61-
log = "0.4.19"
6260
memchr = "2.5.0"
6361
miow = "0.6.0"
6462
opener = "0.6.1"
@@ -69,7 +67,6 @@ pathdiff = "0.2"
6967
percent-encoding = "2.3"
7068
pkg-config = "0.3.27"
7169
pretty_assertions = "1.4.0"
72-
pretty_env_logger = "0.5.0"
7370
proptest = "1.2.0"
7471
pulldown-cmark = { version = "0.9.3", default-features = false }
7572
rand = "0.8.5"
@@ -94,6 +91,8 @@ thiserror = "1.0.44"
9491
time = { version = "0.3", features = ["parsing", "formatting", "serde"] }
9592
toml = "0.7.6"
9693
toml_edit = "0.19.14"
94+
tracing = "0.1.37"
95+
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
9796
unicase = "2.6.0"
9897
unicode-width = "0.1.10"
9998
unicode-xid = "0.2.4"
@@ -132,7 +131,6 @@ clap = { workspace = true, features = ["wrap_help"] }
132131
crates-io.workspace = true
133132
curl = { workspace = true, features = ["http2"] }
134133
curl-sys.workspace = true
135-
env_logger.workspace = true
136134
filetime.workspace = true
137135
flate2.workspace = true
138136
git2.workspace = true
@@ -153,13 +151,11 @@ jobserver.workspace = true
153151
lazycell.workspace = true
154152
libc.workspace = true
155153
libgit2-sys.workspace = true
156-
log.workspace = true
157154
memchr.workspace = true
158155
opener.workspace = true
159156
os_info.workspace = true
160157
pasetors.workspace = true
161158
pathdiff.workspace = true
162-
pretty_env_logger = { workspace = true, optional = true }
163159
pulldown-cmark.workspace = true
164160
rand.workspace = true
165161
rustfix.workspace = true
@@ -178,6 +174,8 @@ termcolor.workspace = true
178174
time.workspace = true
179175
toml.workspace = true
180176
toml_edit.workspace = true
177+
tracing.workspace = true
178+
tracing-subscriber.workspace = true
181179
unicase.workspace = true
182180
unicode-width.workspace = true
183181
unicode-xid.workspace = true
@@ -218,6 +216,5 @@ doc = false
218216
[features]
219217
vendored-openssl = ["openssl/vendored"]
220218
vendored-libgit2 = ["libgit2-sys/vendored"]
221-
pretty-env-logger = ["pretty_env_logger"]
222219
# This is primarily used by rust-lang/rust distributing cargo the executable.
223220
all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx']

crates/cargo-util/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ filetime.workspace = true
1414
hex.workspace = true
1515
jobserver.workspace = true
1616
libc.workspace = true
17-
log.workspace = true
1817
same-file.workspace = true
1918
shell-escape.workspace = true
2019
tempfile.workspace = true
20+
tracing.workspace = true
2121
walkdir.workspace = true
2222

2323
[target.'cfg(target_os = "macos")'.dependencies]

0 commit comments

Comments
 (0)