X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.lock;h=3a7e6ea676fa05a8cf708e48960c1eb2f4b13d48;hb=46326b8db7a47109242c6671272e942c843305c5;hp=644405063352cb305b0d89b1788fcfbdcf6ebe0a;hpb=ca6a1d8c632995e258c75ba21ce454705f1bfde6;p=rust.git diff --git a/Cargo.lock b/Cargo.lock index 64440506335..3a7e6ea676f 100644 --- 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" @@ -93,7 +99,6 @@ dependencies = [ "profile", "rustc-hash", "salsa", - "stdx", "syntax", "test_utils", "tt", @@ -102,9 +107,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" @@ -139,16 +144,19 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" [[package]] name = "cfg" version = "0.0.0" dependencies = [ + "arbitrary", + "derive_arbitrary", "expect-test", "mbe", + "oorandom", "rustc-hash", "syntax", "tt", @@ -162,9 +170,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chalk-derive" -version = "0.70.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b29a4ef88867aee29bc709976d9b0a20ddb2c52aeca0bd635893a74fa77d7f6" +checksum = "059cce4ba41e57dd82f55b348d3e83cb30fd142479d00287f08c4ae66f9e7197" dependencies = [ "proc-macro2", "quote", @@ -174,9 +182,9 @@ dependencies = [ [[package]] name = "chalk-ir" -version = "0.70.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3efd5b260d23af3daebae111ea4066604dd3cdb18ca610358ab2e2a7aab71461" +checksum = "c0f9b041f3fcc136dbf8a92cef5f6ac743f9800467763502f5924349b781cbe0" dependencies = [ "bitflags", "chalk-derive", @@ -185,9 +193,9 @@ dependencies = [ [[package]] name = "chalk-recursive" -version = "0.70.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8089c69051fa6bfdadb67f6dc951881f99fef6814e0e0c27c47218e34d8adb" +checksum = "b1dd77179b3310dea3838b73e0f5990fcf4d1c00bfd2bc43d984faa8d2783ff1" dependencies = [ "chalk-derive", "chalk-ir", @@ -198,9 +206,9 @@ dependencies = [ [[package]] name = "chalk-solve" -version = "0.70.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ad0c276126d7787577d22f82785d8f2795318ad30349e66b487a6d6a591e351" +checksum = "0c8ff6810c6bcac76950d1d292f71862e5757f483b8745a9186e649076b913be" dependencies = [ "chalk-derive", "chalk-ir", @@ -291,6 +299,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 +343,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" @@ -363,9 +373,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +checksum = "80edafed416a46fb378521624fab1cfa2eb514784fd8921adbe8a8d8321da811" dependencies = [ "cfg-if", "crc32fast", @@ -380,12 +390,12 @@ dependencies = [ "cargo_metadata", "crossbeam-channel", "jod-thread", - "log", "paths", "serde", "serde_json", "stdx", "toolchain", + "tracing", ] [[package]] @@ -460,9 +470,7 @@ dependencies = [ "hir_def", "hir_expand", "hir_ty", - "indexmap", "itertools", - "log", "once_cell", "profile", "rustc-hash", @@ -490,7 +498,6 @@ dependencies = [ "itertools", "la-arena", "limit", - "log", "mbe", "once_cell", "profile", @@ -499,6 +506,7 @@ dependencies = [ "stdx", "syntax", "test_utils", + "tracing", "tt", ] @@ -511,15 +519,14 @@ dependencies = [ "cov-mark", "either", "expect-test", + "itertools", "la-arena", "limit", - "log", "mbe", - "parser", "profile", "rustc-hash", "syntax", - "test_utils", + "tracing", "tt", ] @@ -540,7 +547,6 @@ dependencies = [ "itertools", "la-arena", "limit", - "log", "once_cell", "profile", "rustc-hash", @@ -580,7 +586,6 @@ dependencies = [ "ide_ssr", "indexmap", "itertools", - "log", "oorandom", "profile", "pulldown-cmark", @@ -590,6 +595,7 @@ dependencies = [ "syntax", "test_utils", "text_edit", + "tracing", "url", ] @@ -624,7 +630,6 @@ dependencies = [ "hir", "ide_db", "itertools", - "log", "once_cell", "profile", "rustc-hash", @@ -648,7 +653,6 @@ dependencies = [ "hir", "itertools", "limit", - "log", "once_cell", "profile", "rayon", @@ -657,6 +661,7 @@ dependencies = [ "syntax", "test_utils", "text_edit", + "tracing", ] [[package]] @@ -755,9 +760,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" @@ -767,9 +772,9 @@ checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae" [[package]] name = "kqueue" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512705bfcaeb3d46379771adc69deab978355fc68fdf960f9fb11abc8d678a96" +checksum = "058a107a784f8be94c7d35c1300f4facced2e93d2fbe5b1452b44e905ddca4a9" dependencies = [ "kqueue-sys", "libc", @@ -777,9 +782,9 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9803ae382091c10a5c7297ffb9fde284dbc9662b249f86eacef605d97ae92d99" +checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" dependencies = [ "bitflags", "libc", @@ -826,9 +831,9 @@ version = "0.0.0" [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" dependencies = [ "scopeguard", ] @@ -887,28 +892,28 @@ name = "mbe" version = "0.0.0" dependencies = [ "cov-mark", - "log", + "expect-test", "parser", - "profile", "rustc-hash", "smallvec", "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", ] @@ -965,9 +970,9 @@ dependencies = [ [[package]] name = "notify" -version = "5.0.0-pre.11" +version = "5.0.0-pre.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c614e7ed2b1cf82ec99aeffd8cf6225ef5021b9951148eb161393c394855032c" +checksum = "20a629259bb2c87a884bb76f6086c8637919de6d074754341c12e5dd3aed6326" dependencies = [ "bitflags", "crossbeam-channel", @@ -1002,9 +1007,9 @@ dependencies = [ [[package]] name = "object" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386" +checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" dependencies = [ "memchr", ] @@ -1023,9 +1028,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", @@ -1034,9 +1039,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ "cfg-if", "instant", @@ -1062,9 +1067,6 @@ checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" [[package]] name = "paths" version = "0.0.0" -dependencies = [ - "serde", -] [[package]] name = "percent-encoding" @@ -1109,9 +1111,9 @@ checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" dependencies = [ "unicode-xid", ] @@ -1120,10 +1122,6 @@ dependencies = [ name = "proc_macro_api" version = "0.0.0" dependencies = [ - "base_db", - "crossbeam-channel", - "jod-thread", - "log", "memmap2", "object", "paths", @@ -1132,6 +1130,7 @@ dependencies = [ "serde_json", "snap", "stdx", + "tracing", "tt", ] @@ -1139,7 +1138,6 @@ dependencies = [ name = "proc_macro_srv" version = "0.0.0" dependencies = [ - "cargo_metadata", "expect-test", "libloading", "mbe", @@ -1148,8 +1146,6 @@ dependencies = [ "paths", "proc_macro_api", "proc_macro_test", - "test_utils", - "toolchain", "tt", ] @@ -1190,9 +1186,7 @@ dependencies = [ "cfg", "expect-test", "la-arena", - "log", "paths", - "proc_macro_api", "profile", "rustc-hash", "semver", @@ -1200,6 +1194,7 @@ dependencies = [ "serde_json", "stdx", "toolchain", + "tracing", ] [[package]] @@ -1215,9 +1210,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-to-cmark" -version = "6.0.2" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95048382115a9da7be92ad51c84064d585b7da17472dcaa7f5eed8853c4c3707" +checksum = "a72d775989b8b4cc8e5e924a99d6b3ed960da727f78394b7abd539301972e08e" dependencies = [ "pulldown-cmark", ] @@ -1291,9 +1286,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 +1306,6 @@ dependencies = [ "cfg", "crossbeam-channel", "dissimilar", - "env_logger", "expect-test", "flycheck", "hir", @@ -1322,13 +1316,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", @@ -1340,11 +1334,11 @@ dependencies = [ "stdx", "syntax", "test_utils", - "text_edit", "threadpool", "tikv-jemallocator", "toolchain", "tracing", + "tracing-log", "tracing-subscriber", "tracing-tree", "tt", @@ -1366,9 +1360,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] name = "rustc-hash" @@ -1443,18 +1437,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -1463,9 +1457,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950" dependencies = [ "indexmap", "itoa", @@ -1504,9 +1498,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 +1525,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.74" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" dependencies = [ "proc-macro2", "quote", @@ -1559,7 +1550,6 @@ dependencies = [ name = "syntax" version = "0.0.0" dependencies = [ - "arrayvec", "cov-mark", "expect-test", "indexmap", @@ -1573,7 +1563,6 @@ dependencies = [ "rowan", "rustc-ap-rustc_lexer", "rustc-hash", - "serde", "smol_str", "sourcegen", "stdx", @@ -1712,9 +1701,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 +1721,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,18 +1732,19 @@ dependencies = [ "thread_local", "tracing", "tracing-core", + "tracing-log", ] [[package]] name = "tracing-tree" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1712b40907f8d9bc2bc66763ab61dec914b7123d7149e59feb0d4e2a95fc4967" +checksum = "4d850f81a21b3877d4360a079c35b7b78f2674f2dafa5c9d381c53c65acebea3" dependencies = [ "ansi_term", "atty", "termcolor", - "tracing", + "tracing-core", "tracing-log", "tracing-subscriber", ] @@ -1844,10 +1834,9 @@ version = "0.0.0" dependencies = [ "crossbeam-channel", "jod-thread", - "log", "notify", "paths", - "rustc-hash", + "tracing", "vfs", "walkdir", ] @@ -1917,18 +1906,18 @@ checksum = "da260301476ad19a4733a0e930db8227a48ea04561e235a5102978145ec69fcc" [[package]] name = "xshell" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c640362f1b150e186b76e88606e4b01a7b2f1d56cc50fcc184ddb683fb567c23" +checksum = "eaad2035244c56da05573d4d7fda5f903c60a5f35b9110e157a14a1df45a9f14" dependencies = [ "xshell-macros", ] [[package]] name = "xshell-macros" -version = "0.1.14" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0607c095c96c1d8420ce4a018a0954fb15d73d5eb59b521a05a0f04cffc05059" +checksum = "4916a4a3cad759e499a3620523bf9545cc162d7a06163727dde97ce9aaa4cf39" [[package]] name = "xtask"