Merge #10103

[rust.git] / Cargo.lock

diff --git a/Cargo.lock b/Cargo.lock
index cb154973faaa533ab834be056407a032fc2e5d1a..1842bf46da2b70001fa6cd2cc98c7f20b593e775 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -37,9 +37,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.42"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486"
+checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf"
 
 [[package]]
 name = "anymap"
@@ -47,6 +47,12 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344"
 
+[[package]]
+name = "arbitrary"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "577b08a4acd7b99869f863c50011b01eb73424ccc798ecd996f2e24817adfca7"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.1"
@@ -102,9 +108,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da1976d75adbe5fbc88130ecd119529cf1cc6a93ae1546d8696ee66f0d21af1"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "camino"
@@ -147,8 +153,11 @@ checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
 name = "cfg"
 version = "0.0.0"
 dependencies = [
+ "arbitrary",
+ "derive_arbitrary",
  "expect-test",
  "mbe",
+ "oorandom",
  "rustc-hash",
  "syntax",
  "tt",
@@ -291,6 +300,17 @@ dependencies = [
  "num_cpus",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b24629208e87a2d8b396ff43b15c4afb0a69cea3fbbaa9ed9b92b7c02f0aed73"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dissimilar"
 version = "1.0.2"
@@ -324,15 +344,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "expect-test"
 version = "1.1.0"
@@ -380,12 +391,12 @@ dependencies = [
  "cargo_metadata",
  "crossbeam-channel",
  "jod-thread",
- "log",
  "paths",
  "serde",
  "serde_json",
  "stdx",
  "toolchain",
+ "tracing",
 ]
 
 [[package]]
@@ -462,7 +473,6 @@ dependencies = [
  "hir_ty",
  "indexmap",
  "itertools",
- "log",
  "once_cell",
  "profile",
  "rustc-hash",
@@ -490,7 +500,6 @@ dependencies = [
  "itertools",
  "la-arena",
  "limit",
- "log",
  "mbe",
  "once_cell",
  "profile",
@@ -499,6 +508,7 @@ dependencies = [
  "stdx",
  "syntax",
  "test_utils",
+ "tracing",
  "tt",
 ]
 
@@ -511,15 +521,16 @@ dependencies = [
  "cov-mark",
  "either",
  "expect-test",
+ "itertools",
  "la-arena",
  "limit",
- "log",
  "mbe",
  "parser",
  "profile",
  "rustc-hash",
  "syntax",
  "test_utils",
+ "tracing",
  "tt",
 ]
 
@@ -540,7 +551,6 @@ dependencies = [
  "itertools",
  "la-arena",
  "limit",
- "log",
  "once_cell",
  "profile",
  "rustc-hash",
@@ -580,7 +590,6 @@ dependencies = [
  "ide_ssr",
  "indexmap",
  "itertools",
- "log",
  "oorandom",
  "profile",
  "pulldown-cmark",
@@ -590,6 +599,7 @@ dependencies = [
  "syntax",
  "test_utils",
  "text_edit",
+ "tracing",
  "url",
 ]
 
@@ -624,7 +634,6 @@ dependencies = [
  "hir",
  "ide_db",
  "itertools",
- "log",
  "once_cell",
  "profile",
  "rustc-hash",
@@ -633,6 +642,7 @@ dependencies = [
  "syntax",
  "test_utils",
  "text_edit",
+ "tracing",
  "xshell",
 ]
 
@@ -648,7 +658,6 @@ dependencies = [
  "hir",
  "itertools",
  "limit",
- "log",
  "once_cell",
  "profile",
  "rayon",
@@ -657,6 +666,7 @@ dependencies = [
  "syntax",
  "test_utils",
  "text_edit",
+ "tracing",
 ]
 
 [[package]]
@@ -755,9 +765,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "jod-thread"
@@ -797,9 +807,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
+checksum = "a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5"
 
 [[package]]
 name = "libloading"
@@ -887,7 +897,7 @@ name = "mbe"
 version = "0.0.0"
 dependencies = [
  "cov-mark",
- "log",
+ "expect-test",
  "parser",
  "profile",
  "rustc-hash",
@@ -895,20 +905,21 @@ dependencies = [
  "stdx",
  "syntax",
  "test_utils",
+ "tracing",
  "tt",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
 [[package]]
 name = "memmap2"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20ff203f7bdc401350b1dbaa0355135777d25f41c0bbc601851bbd6cf61e8ff5"
+checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357"
 dependencies = [
  "libc",
 ]
@@ -1002,9 +1013,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386"
+checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c"
 dependencies = [
  "memchr",
 ]
@@ -1062,9 +1073,6 @@ checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58"
 [[package]]
 name = "paths"
 version = "0.0.0"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "percent-encoding"
@@ -1120,10 +1128,8 @@ dependencies = [
 name = "proc_macro_api"
 version = "0.0.0"
 dependencies = [
- "base_db",
  "crossbeam-channel",
  "jod-thread",
- "log",
  "memmap2",
  "object",
  "paths",
@@ -1132,6 +1138,7 @@ dependencies = [
  "serde_json",
  "snap",
  "stdx",
+ "tracing",
  "tt",
 ]
 
@@ -1190,9 +1197,7 @@ dependencies = [
  "cfg",
  "expect-test",
  "la-arena",
- "log",
  "paths",
- "proc_macro_api",
  "profile",
  "rustc-hash",
  "semver",
@@ -1200,6 +1205,7 @@ dependencies = [
  "serde_json",
  "stdx",
  "toolchain",
+ "tracing",
 ]
 
 [[package]]
@@ -1291,9 +1297,9 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "rowan"
-version = "0.13.0-pre.8"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9635096edc6dc0fe4a8eea7f17307229e2c4f9b8481f4949e221abe7d94ae6ee"
+checksum = "4a938f42b9c73aeece236481f37adb3debb7dfe3ae347cd6a45b5797d9ce4250"
 dependencies = [
  "countme",
  "hashbrown",
@@ -1311,7 +1317,6 @@ dependencies = [
  "cfg",
  "crossbeam-channel",
  "dissimilar",
- "env_logger",
  "expect-test",
  "flycheck",
  "hir",
@@ -1322,13 +1327,13 @@ dependencies = [
  "ide_ssr",
  "itertools",
  "jod-thread",
- "log",
  "lsp-server",
  "lsp-types",
  "mbe",
  "mimalloc",
  "oorandom",
  "parking_lot",
+ "proc_macro_api",
  "proc_macro_srv",
  "profile",
  "project_model",
@@ -1345,6 +1350,7 @@ dependencies = [
  "tikv-jemallocator",
  "toolchain",
  "tracing",
+ "tracing-log",
  "tracing-subscriber",
  "tracing-tree",
  "tt",
@@ -1443,18 +1449,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.127"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
+checksum = "1056a0db1978e9dbf0f6e4fca677f6f9143dc1c19de346f22cac23e422196834"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.127"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
+checksum = "13af2fbb8b60a8950d6c72a56d2095c28870367cc8e10c55e9745bac4995a2c4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1504,9 +1510,6 @@ name = "smol_str"
 version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b203e79e90905594272c1c97c7af701533d42adaab0beb3859018e477d54a3b0"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "snap"
@@ -1534,9 +1537,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.74"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
+checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1573,7 +1576,6 @@ dependencies = [
  "rowan",
  "rustc-ap-rustc_lexer",
  "rustc-hash",
- "serde",
  "smol_str",
  "sourcegen",
  "stdx",
@@ -1712,9 +1714,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
+checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8"
 dependencies = [
  "lazy_static",
 ]
@@ -1732,9 +1734,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.19"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48"
+checksum = "b9cbe87a2fa7e35900ce5de20220a582a9483a7063811defce79d7cbd59d4cfe"
 dependencies = [
  "lazy_static",
  "matchers",
@@ -1743,6 +1745,7 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]
@@ -1844,10 +1847,10 @@ version = "0.0.0"
 dependencies = [
  "crossbeam-channel",
  "jod-thread",
- "log",
  "notify",
  "paths",
  "rustc-hash",
+ "tracing",
  "vfs",
  "walkdir",
 ]