Skip to content

Commit ea25b77

Browse files
committed
Update chalk to 0.75.0
- Compute flags in `intern_ty` - Remove tracing-serde from PERMITTED_DEPENDENCIES - Disable `tracing-full` feature in `chalk-solve` - Bump tracing-tree to 0.2.0
1 parent 9e1aff8 commit ea25b77

File tree

10 files changed

+164
-152
lines changed

10 files changed

+164
-152
lines changed

Cargo.lock

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
492492

493493
[[package]]
494494
name = "chalk-derive"
495-
version = "0.55.0"
495+
version = "0.75.0"
496496
source = "registry+https://github.com/rust-lang/crates.io-index"
497-
checksum = "3983193cacd81f0f924acb666b7fe5e1a0d81db9f113fa69203eda7ea8ce8b6c"
497+
checksum = "d54e3b5f9e3425e6b119ff07568d8d006bfa5a8d6f78a9cbc3530b1e962e316c"
498498
dependencies = [
499499
"proc-macro2",
500500
"quote",
@@ -504,9 +504,9 @@ dependencies = [
504504

505505
[[package]]
506506
name = "chalk-engine"
507-
version = "0.55.0"
507+
version = "0.75.0"
508508
source = "registry+https://github.com/rust-lang/crates.io-index"
509-
checksum = "05a171ce5abbf0fbd06f221ab80ab182c7ef78603d23b858bc44e7ce8a86a396"
509+
checksum = "bdc891073396b167163db77123b0a3c00088edc00466cecc5531f33e3e989523"
510510
dependencies = [
511511
"chalk-derive",
512512
"chalk-ir",
@@ -517,9 +517,9 @@ dependencies = [
517517

518518
[[package]]
519519
name = "chalk-ir"
520-
version = "0.55.0"
520+
version = "0.75.0"
521521
source = "registry+https://github.com/rust-lang/crates.io-index"
522-
checksum = "a522f53af971e7678f472d687e053120157b3ae26e2ebd5ecbc0f5ab124f2cb6"
522+
checksum = "2b79e5a1d04b79311e90c69356a2c62027853906a7e33b3e070b93c055fc3e8a"
523523
dependencies = [
524524
"bitflags",
525525
"chalk-derive",
@@ -528,18 +528,18 @@ dependencies = [
528528

529529
[[package]]
530530
name = "chalk-solve"
531-
version = "0.55.0"
531+
version = "0.75.0"
532532
source = "registry+https://github.com/rust-lang/crates.io-index"
533-
checksum = "cdf79fb77a567e456a170f7ec84ea6584163d4ba3f13660cd182013d34ca667c"
533+
checksum = "a5d2a1db6605aba70a58820bd80ac422b218913a510f1a40beef9efc5371ea1d"
534534
dependencies = [
535535
"chalk-derive",
536536
"chalk-ir",
537537
"ena",
538-
"itertools 0.9.0",
538+
"itertools 0.10.1",
539539
"petgraph",
540540
"rustc-hash",
541541
"tracing",
542-
"tracing-subscriber",
542+
"tracing-subscriber 0.3.3",
543543
"tracing-tree",
544544
]
545545

@@ -680,9 +680,9 @@ dependencies = [
680680

681681
[[package]]
682682
name = "compiler_builtins"
683-
version = "0.1.65"
683+
version = "0.1.66"
684684
source = "registry+https://github.com/rust-lang/crates.io-index"
685-
checksum = "ed37ea958309f2451e1cea7fd2b37aa56b1894c9a9fbdbbe6a194f7b78f0362d"
685+
checksum = "191424db7756bbed2c4996959a0fbda94388abcf4f5a2728a8af17481ad9c4f7"
686686
dependencies = [
687687
"cc",
688688
"rustc-std-workspace-core",
@@ -704,7 +704,7 @@ dependencies = [
704704
"serde",
705705
"serde_json",
706706
"tracing",
707-
"tracing-subscriber",
707+
"tracing-subscriber 0.2.16",
708708
"unified-diff",
709709
"walkdir",
710710
"winapi",
@@ -2114,6 +2114,15 @@ dependencies = [
21142114
"regex-automata",
21152115
]
21162116

2117+
[[package]]
2118+
name = "matchers"
2119+
version = "0.1.0"
2120+
source = "registry+https://github.com/rust-lang/crates.io-index"
2121+
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
2122+
dependencies = [
2123+
"regex-automata",
2124+
]
2125+
21172126
[[package]]
21182127
name = "matches"
21192128
version = "0.1.8"
@@ -3845,7 +3854,7 @@ dependencies = [
38453854
"rustc_target",
38463855
"rustc_typeck",
38473856
"tracing",
3848-
"tracing-subscriber",
3857+
"tracing-subscriber 0.2.16",
38493858
"tracing-tree",
38503859
"winapi",
38513860
]
@@ -4624,7 +4633,7 @@ dependencies = [
46244633
"tempfile",
46254634
"tera",
46264635
"tracing",
4627-
"tracing-subscriber",
4636+
"tracing-subscriber 0.2.16",
46284637
"tracing-tree",
46294638
]
46304639

@@ -5121,9 +5130,9 @@ dependencies = [
51215130

51225131
[[package]]
51235132
name = "synstructure"
5124-
version = "0.12.4"
5133+
version = "0.12.6"
51255134
source = "registry+https://github.com/rust-lang/crates.io-index"
5126-
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
5135+
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
51275136
dependencies = [
51285137
"proc-macro2",
51295138
"quote",
@@ -5447,50 +5456,52 @@ dependencies = [
54475456
]
54485457

54495458
[[package]]
5450-
name = "tracing-serde"
5451-
version = "0.1.2"
5459+
name = "tracing-subscriber"
5460+
version = "0.2.16"
54525461
source = "registry+https://github.com/rust-lang/crates.io-index"
5453-
checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
5462+
checksum = "8ab8966ac3ca27126141f7999361cc97dd6fb4b71da04c02044fa9045d98bb96"
54545463
dependencies = [
5455-
"serde",
5464+
"ansi_term 0.12.1",
5465+
"lazy_static",
5466+
"matchers 0.0.1",
5467+
"parking_lot",
5468+
"regex",
5469+
"sharded-slab",
5470+
"smallvec",
5471+
"thread_local",
5472+
"tracing",
54565473
"tracing-core",
54575474
]
54585475

54595476
[[package]]
54605477
name = "tracing-subscriber"
5461-
version = "0.2.16"
5478+
version = "0.3.3"
54625479
source = "registry+https://github.com/rust-lang/crates.io-index"
5463-
checksum = "8ab8966ac3ca27126141f7999361cc97dd6fb4b71da04c02044fa9045d98bb96"
5480+
checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3"
54645481
dependencies = [
54655482
"ansi_term 0.12.1",
5466-
"chrono",
54675483
"lazy_static",
5468-
"matchers",
5469-
"parking_lot",
5484+
"matchers 0.1.0",
54705485
"regex",
5471-
"serde",
5472-
"serde_json",
54735486
"sharded-slab",
54745487
"smallvec",
54755488
"thread_local",
54765489
"tracing",
54775490
"tracing-core",
54785491
"tracing-log",
5479-
"tracing-serde",
54805492
]
54815493

54825494
[[package]]
54835495
name = "tracing-tree"
5484-
version = "0.1.9"
5496+
version = "0.2.0"
54855497
source = "registry+https://github.com/rust-lang/crates.io-index"
5486-
checksum = "1712b40907f8d9bc2bc66763ab61dec914b7123d7149e59feb0d4e2a95fc4967"
5498+
checksum = "3ce989c9962c7f61fe084dd4a230eec784649dfc2392467c790007c3a6e134e7"
54875499
dependencies = [
54885500
"ansi_term 0.12.1",
54895501
"atty",
5490-
"termcolor",
5491-
"tracing",
5502+
"tracing-core",
54925503
"tracing-log",
5493-
"tracing-subscriber",
5504+
"tracing-subscriber 0.3.3",
54945505
]
54955506

54965507
[[package]]

compiler/rustc_driver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ libc = "0.2"
1111
atty = "0.2"
1212
tracing = { version = "0.1.28" }
1313
tracing-subscriber = { version = "0.2.16", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
14-
tracing-tree = "0.1.9"
14+
tracing-tree = "0.2.0"
1515
rustc_middle = { path = "../rustc_middle" }
1616
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1717
rustc_target = { path = "../rustc_target" }

compiler/rustc_middle/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ rustc_index = { path = "../rustc_index" }
2929
rustc_serialize = { path = "../rustc_serialize" }
3030
rustc_ast = { path = "../rustc_ast" }
3131
rustc_span = { path = "../rustc_span" }
32-
chalk-ir = "0.55.0"
32+
chalk-ir = "0.75.0"
3333
smallvec = { version = "1.6.1", features = ["union", "may_dangle"] }
3434
rustc_session = { path = "../rustc_session" }
3535
rustc_type_ir = { path = "../rustc_type_ir" }

0 commit comments

Comments
 (0)