Merge #10103

[rust.git] / Cargo.lock

diff --git a/Cargo.lock b/Cargo.lock
index 90fcb2ac27dc6b55f3c084f49bdb7709c88e4814..1842bf46da2b70001fa6cd2cc98c7f20b593e775 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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"
@@ -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",
 ]
 
@@ -514,13 +524,13 @@ dependencies = [
  "itertools",
  "la-arena",
  "limit",
- "log",
  "mbe",
  "parser",
  "profile",
  "rustc-hash",
  "syntax",
  "test_utils",
+ "tracing",
  "tt",
 ]
 
@@ -541,7 +551,6 @@ dependencies = [
  "itertools",
  "la-arena",
  "limit",
- "log",
  "once_cell",
  "profile",
  "rustc-hash",
@@ -581,7 +590,6 @@ dependencies = [
  "ide_ssr",
  "indexmap",
  "itertools",
- "log",
  "oorandom",
  "profile",
  "pulldown-cmark",
@@ -591,6 +599,7 @@ dependencies = [
  "syntax",
  "test_utils",
  "text_edit",
+ "tracing",
  "url",
 ]
 
@@ -625,7 +634,6 @@ dependencies = [
  "hir",
  "ide_db",
  "itertools",
- "log",
  "once_cell",
  "profile",
  "rustc-hash",
@@ -634,6 +642,7 @@ dependencies = [
  "syntax",
  "test_utils",
  "text_edit",
+ "tracing",
  "xshell",
 ]
 
@@ -649,7 +658,6 @@ dependencies = [
  "hir",
  "itertools",
  "limit",
- "log",
  "once_cell",
  "profile",
  "rayon",
@@ -658,6 +666,7 @@ dependencies = [
  "syntax",
  "test_utils",
  "text_edit",
+ "tracing",
 ]
 
 [[package]]
@@ -889,7 +898,6 @@ version = "0.0.0"
 dependencies = [
  "cov-mark",
  "expect-test",
- "log",
  "parser",
  "profile",
  "rustc-hash",
@@ -897,6 +905,7 @@ dependencies = [
  "stdx",
  "syntax",
  "test_utils",
+ "tracing",
  "tt",
 ]
 
@@ -1064,9 +1073,6 @@ checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58"
 [[package]]
 name = "paths"
 version = "0.0.0"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "percent-encoding"
@@ -1124,7 +1130,6 @@ version = "0.0.0"
 dependencies = [
  "crossbeam-channel",
  "jod-thread",
- "log",
  "memmap2",
  "object",
  "paths",
@@ -1133,6 +1138,7 @@ dependencies = [
  "serde_json",
  "snap",
  "stdx",
+ "tracing",
  "tt",
 ]
 
@@ -1191,7 +1197,6 @@ dependencies = [
  "cfg",
  "expect-test",
  "la-arena",
- "log",
  "paths",
  "profile",
  "rustc-hash",
@@ -1200,6 +1205,7 @@ dependencies = [
  "serde_json",
  "stdx",
  "toolchain",
+ "tracing",
 ]
 
 [[package]]
@@ -1311,7 +1317,6 @@ dependencies = [
  "cfg",
  "crossbeam-channel",
  "dissimilar",
- "env_logger",
  "expect-test",
  "flycheck",
  "hir",
@@ -1322,7 +1327,6 @@ dependencies = [
  "ide_ssr",
  "itertools",
  "jod-thread",
- "log",
  "lsp-server",
  "lsp-types",
  "mbe",
@@ -1346,6 +1350,7 @@ dependencies = [
  "tikv-jemallocator",
  "toolchain",
  "tracing",
+ "tracing-log",
  "tracing-subscriber",
  "tracing-tree",
  "tt",
@@ -1505,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"
@@ -1574,7 +1576,6 @@ dependencies = [
  "rowan",
  "rustc-ap-rustc_lexer",
  "rustc-hash",
- "serde",
  "smol_str",
  "sourcegen",
  "stdx",
@@ -1744,6 +1745,7 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]
@@ -1845,10 +1847,10 @@ version = "0.0.0"
 dependencies = [
  "crossbeam-channel",
  "jod-thread",
- "log",
  "notify",
  "paths",
  "rustc-hash",
+ "tracing",
  "vfs",
  "walkdir",
 ]