From b08c0281af585fdce92761ca4657377aefb659fe Mon Sep 17 00:00:00 2001 From: Wilco Kusee Date: Sat, 27 Feb 2021 08:16:33 +0100 Subject: [PATCH 1/3] Bump dependencies --- Cargo.lock | 94 ++++++++++++++++++++++++------------ Cargo.toml | 6 +-- chalk-integration/Cargo.toml | 2 +- chalk-solve/Cargo.toml | 2 +- 4 files changed, 67 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b83c08dbe9e..b757d33efe8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -148,6 +148,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "chalk" version = "0.59.0-dev.0" @@ -161,7 +167,7 @@ dependencies = [ "chalk-solve", "diff", "docopt", - "itertools", + "itertools 0.10.0", "pretty_assertions", "regex", "rustyline", @@ -246,7 +252,7 @@ dependencies = [ "chalk-integration", "chalk-ir", "ena", - "itertools", + "itertools 0.10.0", "petgraph", "rustc-hash", "tracing", @@ -287,10 +293,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", +] + [[package]] name = "ctor" version = "0.1.15" @@ -335,11 +351,11 @@ dependencies = [ [[package]] name = "dirs-next" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cbcf9241d9e8d106295bd496bbe2e9cffd5fa098f2a8c9e2bbcbf09773c11a8" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "dirs-sys-next", ] @@ -393,6 +409,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "generic-array" version = "0.12.3" @@ -408,7 +434,7 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "wasi", ] @@ -465,6 +491,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.6" @@ -483,7 +518,7 @@ dependencies = [ "diff", "docopt", "ena", - "itertools", + "itertools 0.9.0", "lalrpop-util", "petgraph", "regex", @@ -513,9 +548,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.74" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" +checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" [[package]] name = "lock_api" @@ -532,7 +567,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -558,15 +593,14 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "nix" -version = "0.17.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" dependencies = [ "bitflags", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", - "void", ] [[package]] @@ -626,7 +660,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi", "instant", "libc", @@ -744,7 +778,7 @@ dependencies = [ "base64", "blake2b_simd", "constant_time_eq", - "crossbeam-utils", + "crossbeam-utils 0.7.2", ] [[package]] @@ -755,12 +789,14 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustyline" -version = "6.2.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3358c21cbbc1a751892528db4e1de4b7a2b6a73f001e215aaba97d712cfa9777" +checksum = "8227301bfc717136f0ecbd3d064ba8199e44497a0bdd46bb01ede4387cfd2cec" dependencies = [ - "cfg-if", + "bitflags", + "cfg-if 1.0.0", "dirs-next", + "fs2", "libc", "log", "memchr", @@ -780,11 +816,11 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "salsa" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab29056d4fb4048a5f0d169c9b6e5526160c9ec37aded5a6879c2c9c445a8e4" +checksum = "d8fadca2ab5de17acf66d744f4888049ca8f1bb9b8a1ab8afd9d032cc959c5dc" dependencies = [ - "crossbeam-utils", + "crossbeam-utils 0.8.3", "indexmap", "lock_api", "log", @@ -797,9 +833,9 @@ dependencies = [ [[package]] name = "salsa-macros" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1c3aec007c63c4ed4cd7a018529fb0b5575c4562575fc6a40d6cd2ae0b792ef" +checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2" dependencies = [ "heck", "proc-macro2", @@ -964,7 +1000,7 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "tracing-attributes", "tracing-core", ] @@ -1075,12 +1111,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 008012a5cf4..c907d81a79e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,9 +15,9 @@ bench = [] [dependencies] docopt = "1.1.0" -itertools = "0.9.0" -rustyline = "6.2.0" -salsa = "0.15.0" +itertools = "0.10.0" +rustyline = "7.1.0" +salsa = "0.16.0" serde = "1.0" serde_derive = "1.0" diff --git a/chalk-integration/Cargo.toml b/chalk-integration/Cargo.toml index 36dd812bfa2..bc0a11fb5c4 100644 --- a/chalk-integration/Cargo.toml +++ b/chalk-integration/Cargo.toml @@ -11,7 +11,7 @@ publish = false [dependencies] string_cache = "0.8.0" -salsa = "0.15.0" +salsa = "0.16.0" tracing = "0.1" chalk-derive = { version = "0.59.0-dev.0", path = "../chalk-derive" } diff --git a/chalk-solve/Cargo.toml b/chalk-solve/Cargo.toml index 825f98264c1..e61dd6c5b54 100644 --- a/chalk-solve/Cargo.toml +++ b/chalk-solve/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] ena = "0.14.0" -itertools = "0.9.0" +itertools = "0.10.0" petgraph = "0.5.1" tracing = "0.1" tracing-subscriber = { version = "0.2", optional = true } From 27ff44f3f800e626a35a4edbdc863d0ad21dbe3f Mon Sep 17 00:00:00 2001 From: Wilco Kusee Date: Sat, 27 Feb 2021 08:19:35 +0100 Subject: [PATCH 2/3] Expose tracing features in chalk-recursive --- chalk-recursive/Cargo.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/chalk-recursive/Cargo.toml b/chalk-recursive/Cargo.toml index 395ca95442c..330a77452fa 100644 --- a/chalk-recursive/Cargo.toml +++ b/chalk-recursive/Cargo.toml @@ -9,9 +9,6 @@ readme = "README.md" keywords = ["compiler", "traits", "prolog"] edition = "2018" -[features] -default = [] - [dependencies] rustc-hash = { version = "1.1.0" } tracing = "0.1" @@ -22,3 +19,8 @@ chalk-solve = { version = "0.59.0-dev.0", path = "../chalk-solve" } [dev-dependencies] chalk-integration = { path = "../chalk-integration" } + +[features] +default = ["tracing-full"] + +tracing-full = ["chalk-solve/tracing-subscriber", "chalk-solve/tracing-tree"] From 49e13f68250ab71b98e50b2ef38f6bb9c0da7104 Mon Sep 17 00:00:00 2001 From: Wilco Kusee Date: Sat, 27 Feb 2021 08:29:33 +0100 Subject: [PATCH 3/3] Disable unneeded dependency features --- Cargo.lock | 22 ---------------------- Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b757d33efe8..62fa94ccac5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -349,27 +349,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c60f7b8a8953926148223260454befb50c751d3c50e1c178c4fd1ace4083c9a" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "docopt" version = "1.1.0" @@ -795,7 +774,6 @@ checksum = "8227301bfc717136f0ecbd3d064ba8199e44497a0bdd46bb01ede4387cfd2cec" dependencies = [ "bitflags", "cfg-if 1.0.0", - "dirs-next", "fs2", "libc", "log", diff --git a/Cargo.toml b/Cargo.toml index c907d81a79e..b88724b0929 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ bench = [] [dependencies] docopt = "1.1.0" itertools = "0.10.0" -rustyline = "7.1.0" +rustyline = { version = "7.1.0", default-features = false } salsa = "0.16.0" serde = "1.0" serde_derive = "1.0"