From 724affc442ed9fec707c8fe19400fcae15777d2f Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 2 Jun 2022 17:24:57 -0700 Subject: [PATCH] Upgrade deps to avoid multiple versions of transitive deps * env_logger * prost-build * bindgen --- Cargo.lock | 98 +++++++++++++++---------------- crates/collab/Cargo.toml | 2 +- crates/command_palette/Cargo.toml | 2 +- crates/editor/Cargo.toml | 2 +- crates/file_finder/Cargo.toml | 2 +- crates/gpui/Cargo.toml | 6 +- crates/language/Cargo.toml | 2 +- crates/lsp/Cargo.toml | 2 +- crates/picker/Cargo.toml | 2 +- crates/rpc/Cargo.toml | 2 +- crates/sum_tree/Cargo.toml | 2 +- crates/text/Cargo.toml | 2 +- crates/zed/Cargo.toml | 4 +- 13 files changed, 61 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 148b446d7c..9e3da4e673 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -485,9 +485,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.58.1" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f8523b410d7187a43085e7e064416ea32ded16bd0a4e6fc025e21616d01258f" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ "bitflags", "cexpr", @@ -503,7 +503,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "which 3.1.1", + "which", ] [[package]] @@ -639,11 +639,11 @@ dependencies = [ [[package]] name = "cexpr" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom 5.1.2", + "nom 7.1.1", ] [[package]] @@ -1445,9 +1445,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", "humantime", @@ -1540,9 +1540,9 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.2.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" +checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flate2" @@ -1988,12 +1988,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" - [[package]] name = "hashbrown" version = "0.11.2" @@ -2009,7 +2003,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" dependencies = [ - "hashbrown 0.11.2", + "hashbrown", ] [[package]] @@ -2241,12 +2235,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.6.2" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" dependencies = [ "autocfg 1.0.1", - "hashbrown 0.9.1", + "hashbrown", ] [[package]] @@ -2482,9 +2476,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.119" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libloading" @@ -2722,6 +2716,12 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.3.7" @@ -2848,16 +2848,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - [[package]] name = "nom" version = "6.1.2" @@ -2871,6 +2861,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "ntapi" version = "0.3.7" @@ -3191,9 +3191,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "petgraph" -version = "0.5.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" +checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", "indexmap", @@ -3474,20 +3474,22 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck 0.3.3", "itertools", + "lazy_static", "log", "multimap", "petgraph", - "prost 0.8.0", + "prost 0.9.0", "prost-types", + "regex", "tempfile", - "which 4.1.0", + "which", ] [[package]] @@ -3518,12 +3520,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost 0.8.0", + "prost 0.9.0", ] [[package]] @@ -5812,20 +5814,12 @@ dependencies = [ [[package]] name = "which" -version = "3.1.1" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "libc", -] - -[[package]] -name = "which" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", + "lazy_static", "libc", ] diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index a2a3a377ab..a3c9e689ec 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -65,7 +65,7 @@ settings = { path = "../settings", features = ["test-support"] } theme = { path = "../theme" } workspace = { path = "../workspace", features = ["test-support"] } ctor = "0.1" -env_logger = "0.8" +env_logger = "0.9" util = { path = "../util" } lazy_static = "1.4" serde_json = { version = "1.0", features = ["preserve_order"] } diff --git a/crates/command_palette/Cargo.toml b/crates/command_palette/Cargo.toml index 52fd8bbdc7..25260f4390 100644 --- a/crates/command_palette/Cargo.toml +++ b/crates/command_palette/Cargo.toml @@ -25,4 +25,4 @@ project = { path = "../project", features = ["test-support"] } serde_json = { version = "1.0", features = ["preserve_order"] } workspace = { path = "../workspace", features = ["test-support"] } ctor = "0.1" -env_logger = "0.8" +env_logger = "0.9" diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml index bb487d5d2c..741dd93f33 100644 --- a/crates/editor/Cargo.toml +++ b/crates/editor/Cargo.toml @@ -59,7 +59,7 @@ project = { path = "../project", features = ["test-support"] } settings = { path = "../settings", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] } ctor = "0.1" -env_logger = "0.8" +env_logger = "0.9" rand = "0.8" unindent = "0.1.7" tree-sitter = "0.20" diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml index 554cf433a2..6fd792940d 100644 --- a/crates/file_finder/Cargo.toml +++ b/crates/file_finder/Cargo.toml @@ -25,4 +25,4 @@ gpui = { path = "../gpui", features = ["test-support"] } serde_json = { version = "1.0", features = ["preserve_order"] } workspace = { path = "../workspace", features = ["test-support"] } ctor = "0.1" -env_logger = "0.8" +env_logger = "0.9" diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index 7c7f6f257b..6caddfb26b 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -20,7 +20,7 @@ async-task = "4.0.3" backtrace = { version = "0.3", optional = true } ctor = "0.1" dhat = { version = "0.3", optional = true } -env_logger = { version = "0.8", optional = true } +env_logger = { version = "0.9", optional = true } etagere = "0.2" futures = "0.3" image = "0.23" @@ -47,14 +47,14 @@ usvg = "0.14" waker-fn = "1.1.0" [build-dependencies] -bindgen = "0.58.1" +bindgen = "0.59.2" cc = "1.0.67" [dev-dependencies] backtrace = "0.3" collections = { path = "../collections", features = ["test-support"] } dhat = "0.3" -env_logger = "0.8" +env_logger = "0.9" png = "0.16" simplelog = "0.9" diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml index e105e25225..eed1297cea 100644 --- a/crates/language/Cargo.toml +++ b/crates/language/Cargo.toml @@ -57,7 +57,7 @@ lsp = { path = "../lsp", features = ["test-support"] } text = { path = "../text", features = ["test-support"] } util = { path = "../util", features = ["test-support"] } ctor = "0.1" -env_logger = "0.8" +env_logger = "0.9" rand = "0.8.3" tree-sitter-json = "*" tree-sitter-rust = "*" diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml index 1c663e6b7e..94780a9472 100644 --- a/crates/lsp/Cargo.toml +++ b/crates/lsp/Cargo.toml @@ -30,5 +30,5 @@ gpui = { path = "../gpui", features = ["test-support"] } util = { path = "../util", features = ["test-support"] } async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" } ctor = "0.1" -env_logger = "0.8" +env_logger = "0.9" unindent = "0.1.7" diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml index c74b6927ae..bceb263e23 100644 --- a/crates/picker/Cargo.toml +++ b/crates/picker/Cargo.toml @@ -21,4 +21,4 @@ gpui = { path = "../gpui", features = ["test-support"] } serde_json = { version = "1.0", features = ["preserve_order"] } workspace = { path = "../workspace", features = ["test-support"] } ctor = "0.1" -env_logger = "0.8" +env_logger = "0.9" diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml index 1fac205280..a6b146e1cc 100644 --- a/crates/rpc/Cargo.toml +++ b/crates/rpc/Cargo.toml @@ -31,7 +31,7 @@ tracing = { version = "0.1.34", features = ["log"] } zstd = "0.9" [build-dependencies] -prost-build = "0.8" +prost-build = "0.9" [dev-dependencies] collections = { path = "../collections", features = ["test-support"] } diff --git a/crates/sum_tree/Cargo.toml b/crates/sum_tree/Cargo.toml index b430f2e6b0..02cad4fb9d 100644 --- a/crates/sum_tree/Cargo.toml +++ b/crates/sum_tree/Cargo.toml @@ -13,5 +13,5 @@ log = { version = "0.4.16", features = ["kv_unstable_serde"] } [dev-dependencies] ctor = "0.1" -env_logger = "0.8" +env_logger = "0.9" rand = "0.8.3" diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml index a7209a7507..5f4bb4715d 100644 --- a/crates/text/Cargo.toml +++ b/crates/text/Cargo.toml @@ -28,5 +28,5 @@ collections = { path = "../collections", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] } util = { path = "../util", features = ["test-support"] } ctor = "0.1" -env_logger = "0.8" +env_logger = "0.9" rand = "0.8.3" diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index a9a266a6b7..a8006483e1 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -59,7 +59,7 @@ chrono = "0.4" ctor = "0.1.20" dirs = "3.0" easy-parallel = "3.1.0" -env_logger = "0.8" +env_logger = "0.9" futures = "0.3" http-auth-basic = "0.1.3" ignore = "0.4" @@ -107,7 +107,7 @@ client = { path = "../client", features = ["test-support"] } settings = { path = "../settings", features = ["test-support"] } util = { path = "../util", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] } -env_logger = "0.8" +env_logger = "0.9" serde_json = { version = "1.0", features = ["preserve_order"] } unindent = "0.1.7"