From 193a926d45cd95fca959cb9797fea16b7f755870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Fri, 1 Oct 2021 18:50:52 +0300 Subject: [PATCH 1/4] Bump deps --- Cargo.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47286277018..6f1af2f15a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "anymap" @@ -312,9 +312,9 @@ dependencies = [ [[package]] name = "dissimilar" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4b29f4b9bb94bf267d57269fd0706d343a160937108e9619fe380645428abb" +checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd" [[package]] name = "dot" @@ -373,9 +373,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80edafed416a46fb378521624fab1cfa2eb514784fd8921adbe8a8d8321da811" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ "cfg-if", "crc32fast", @@ -723,9 +723,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b031475cb1b103ee221afb806a23d35e0570bf7271d7588762ceba8127ed43b3" +checksum = "d88ed757e516714cd8736e65b84ed901f72458512111871f20c1d377abdfbf5e" dependencies = [ "bitflags", "inotify-sys", @@ -743,9 +743,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd" dependencies = [ "cfg-if", ] @@ -1211,9 +1211,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-to-cmark" -version = "6.0.3" +version = "6.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a72d775989b8b4cc8e5e924a99d6b3ed960da727f78394b7abd539301972e08e" +checksum = "1f5925e2c68fb0c3c189cd0f6bbcf1e16402a070d4fcaf7600e239e8302dd0e8" dependencies = [ "pulldown-cmark", ] @@ -1287,9 +1287,9 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "rowan" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f050538a65de83ae021294fb50d57f71fb4530fe79af755fc4d4cd61082c01" +checksum = "4f77412a3d1f26af0c0783c23b3555a301b1a49805cba7bf9a7827a9e9e285f0" dependencies = [ "countme", "hashbrown", @@ -1458,9 +1458,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" dependencies = [ "indexmap", "itoa", @@ -1490,9 +1490,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "smol_str" @@ -1526,9 +1526,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.76" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +checksum = "5239bc68e0fef57495900cfea4e8dc75596d9a319d7e16b1e0a440d24e6fe0a0" dependencies = [ "proc-macro2", "quote", @@ -1657,9 +1657,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -1679,9 +1679,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "84f96e095c0c82419687c20ddf5cb3eadb61f4e1405923c9dc8e53a1adacbda8" dependencies = [ "cfg-if", "pin-project-lite", @@ -1691,9 +1691,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" +checksum = "98863d0dd09fa59a1b79c6750ad80dbda6b75f4e71c437a6a1a8cb91a8bcbd77" dependencies = [ "proc-macro2", "quote", @@ -1702,9 +1702,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" +checksum = "46125608c26121c81b0c6d693eab5a420e416da7e43c426d2e8f7df8da8a3acf" dependencies = [ "lazy_static", ] @@ -1722,9 +1722,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.20" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cbe87a2fa7e35900ce5de20220a582a9483a7063811defce79d7cbd59d4cfe" +checksum = "fdd0568dbfe3baf7048b7908d2b32bca0d81cd56bec6d2a8f894b01d74f86be3" dependencies = [ "lazy_static", "matchers", From 34adcc800cfcafb52cdc8cb3a491efb3ca921742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Fri, 1 Oct 2021 18:51:45 +0300 Subject: [PATCH 2/4] Bump libc --- Cargo.lock | 4 ++-- crates/profile/Cargo.toml | 3 +-- crates/stdx/Cargo.toml | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f1af2f15a0..04a0529eabf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -803,9 +803,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.99" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" [[package]] name = "libloading" diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml index 07ef15bbb90..7f7a50eb446 100644 --- a/crates/profile/Cargo.toml +++ b/crates/profile/Cargo.toml @@ -11,8 +11,7 @@ doctest = false [dependencies] once_cell = "1.3.1" cfg-if = "1" -# build issues on freebsd, see https://github.com/rust-analyzer/rust-analyzer/pull/10145#issuecomment-912925976 -libc = "=0.2.99" +libc = "0.2" la-arena = { version = "0.2.0", path = "../../lib/arena" } countme = { version = "2.0.1", features = ["enable"] } jemalloc-ctl = { version = "0.4.1", package = "tikv-jemalloc-ctl", optional = true } diff --git a/crates/stdx/Cargo.toml b/crates/stdx/Cargo.toml index 741bc663276..f6154f1b546 100644 --- a/crates/stdx/Cargo.toml +++ b/crates/stdx/Cargo.toml @@ -9,8 +9,7 @@ edition = "2018" doctest = false [dependencies] -# build issues on freebsd, see https://github.com/rust-analyzer/rust-analyzer/pull/10145#issuecomment-912925976 -libc = "=0.2.99" +libc = "0.2" backtrace = { version = "0.3.44", optional = true } always-assert = { version = "0.1.2", features = ["log"] } # Think twice before adding anything here From ffa8270f6a4fd34a533c2763b55af6ce596b79cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Fri, 1 Oct 2021 18:55:52 +0300 Subject: [PATCH 3/4] Bump memmap2 --- Cargo.lock | 4 ++-- crates/proc_macro_api/Cargo.toml | 4 ++-- crates/proc_macro_srv/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 04a0529eabf..06ae6fccfd5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -912,9 +912,9 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memmap2" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" +checksum = "4647a11b578fead29cdbb34d4adef8dd3dc35b876c9c6d5240d83f205abfe96e" dependencies = [ "libc", ] diff --git a/crates/proc_macro_api/Cargo.toml b/crates/proc_macro_api/Cargo.toml index 99b9ead0fc0..5b1655b9180 100644 --- a/crates/proc_macro_api/Cargo.toml +++ b/crates/proc_macro_api/Cargo.toml @@ -12,7 +12,7 @@ doctest = false serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["unbounded_depth"] } tracing = "0.1" -memmap2 = "0.3.0" +memmap2 = "0.5" snap = "1.0" paths = { path = "../paths", version = "0.0.0" } @@ -25,4 +25,4 @@ profile = { path = "../profile", version = "0.0.0" } [dependencies.object] version = "0.26" default-features = false -features = [ "std", "read_core", "elf", "macho", "pe" ] +features = ["std", "read_core", "elf", "macho", "pe"] diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml index 159e2bfa40f..d0e6bd9990b 100644 --- a/crates/proc_macro_srv/Cargo.toml +++ b/crates/proc_macro_srv/Cargo.toml @@ -17,7 +17,7 @@ object = { version = "0.26", default-features = false, features = [ "pe", ] } libloading = "0.7.0" -memmap2 = "0.3.0" +memmap2 = "0.5" tt = { path = "../tt", version = "0.0.0" } mbe = { path = "../mbe", version = "0.0.0" } From 035cb443aaa4b089c3dfc8acbda96c0d877c8f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Fri, 1 Oct 2021 18:57:04 +0300 Subject: [PATCH 4/4] Bump notify --- Cargo.lock | 4 ++-- crates/vfs-notify/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 06ae6fccfd5..d1058c02c72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -971,9 +971,9 @@ dependencies = [ [[package]] name = "notify" -version = "5.0.0-pre.12" +version = "5.0.0-pre.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20a629259bb2c87a884bb76f6086c8637919de6d074754341c12e5dd3aed6326" +checksum = "245d358380e2352c2d020e8ee62baac09b3420f1f6c012a31326cfced4ad487d" dependencies = [ "bitflags", "crossbeam-channel", diff --git a/crates/vfs-notify/Cargo.toml b/crates/vfs-notify/Cargo.toml index 2f0af5e7214..2b578ff9a4a 100644 --- a/crates/vfs-notify/Cargo.toml +++ b/crates/vfs-notify/Cargo.toml @@ -13,7 +13,7 @@ tracing = "0.1" jod-thread = "0.1.0" walkdir = "2.3.1" crossbeam-channel = "0.5.0" -notify = "=5.0.0-pre.12" +notify = "=5.0.0-pre.13" vfs = { path = "../vfs", version = "0.0.0" } paths = { path = "../paths", version = "0.0.0" }