From 0e6b94de78bb5b356d6fd14a6db91ceb8d76856d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 10:04:37 +0200 Subject: Minor --- Cargo.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index efc17c430..614548cca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -901,6 +901,23 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "proc_macro_srv" +version = "0.0.0" +dependencies = [ + "cargo_metadata", + "difference", + "goblin", + "libloading", + "memmap", + "ra_mbe", + "ra_proc_macro", + "serde_derive", + "test_utils", + "toolchain", + "tt", +] + [[package]] name = "profile" version = "0.0.0" @@ -1132,23 +1149,6 @@ dependencies = [ "tt", ] -[[package]] -name = "proc_macro_srv" -version = "0.0.0" -dependencies = [ - "cargo_metadata", - "difference", - "goblin", - "libloading", - "memmap", - "ra_mbe", - "ra_proc_macro", - "serde_derive", - "test_utils", - "toolchain", - "tt", -] - [[package]] name = "ra_project_model" version = "0.1.0" @@ -1271,6 +1271,7 @@ dependencies = [ "oorandom", "parking_lot", "pico-args", + "proc_macro_srv", "profile", "ra_cfg", "ra_db", @@ -1280,7 +1281,6 @@ dependencies = [ "ra_ide", "ra_ide_db", "ra_mbe", - "proc_macro_srv", "ra_project_model", "ra_ssr", "rayon", -- cgit v1.2.3 From d42ba6397668fe28bd9cd92db829755905469a69 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 10:04:55 +0200 Subject: :arrow_up: crates --- Cargo.lock | 55 +++++++++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 36 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 614548cca..6bace7bd2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,15 +15,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" -[[package]] -name = "aho-corasick" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" -dependencies = [ - "memchr", -] - [[package]] name = "ansi_term" version = "0.12.1" @@ -289,9 +280,9 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "either" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f" [[package]] name = "ena" @@ -551,9 +542,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lazycell" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" @@ -644,12 +635,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - [[package]] name = "memmap" version = "0.7.0" @@ -1219,10 +1204,7 @@ version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" dependencies = [ - "aho-corasick", - "memchr", "regex-syntax", - "thread_local", ] [[package]] @@ -1414,18 +1396,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" dependencies = [ "proc-macro2", "quote", @@ -1471,9 +1453,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "smallvec" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f" +checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" [[package]] name = "smol_str" @@ -1614,9 +1596,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178" +checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c" dependencies = [ "cfg-if", "tracing-attributes", @@ -1625,9 +1607,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b" +checksum = "1fe233f4227389ab7df5b32649239da7ebe0b281824b4e84b342d04d3fd8c25e" dependencies = [ "proc-macro2", "quote", @@ -1636,9 +1618,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d593f98af59ebc017c0648f0117525db358745a8894a8d684e185ba3f45954f9" +checksum = "db63662723c316b43ca36d833707cc93dff82a02ba3d7e354f342682cc8b3545" dependencies = [ "lazy_static", ] @@ -1666,9 +1648,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b33f8b2ef2ab0c3778c12646d9c42a24f7772bee4cdafc72199644a9f58fdc" +checksum = "abd165311cc4d7a555ad11cc77a37756df836182db0d81aac908c8184c584f40" dependencies = [ "ansi_term", "chrono", @@ -1679,6 +1661,7 @@ dependencies = [ "serde_json", "sharded-slab", "smallvec", + "thread_local", "tracing-core", "tracing-log", "tracing-serde", -- cgit v1.2.3 From 2f45cfc415626cfae5cba89c88a25fb3225486f7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 10:08:11 +0200 Subject: Rename ra_mbe -> mbe --- Cargo.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 6bace7bd2..a63cd58f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -635,6 +635,19 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +[[package]] +name = "mbe" +version = "0.0.0" +dependencies = [ + "log", + "parser", + "rustc-hash", + "smallvec", + "syntax", + "test_utils", + "tt", +] + [[package]] name = "memmap" version = "0.7.0" @@ -894,8 +907,8 @@ dependencies = [ "difference", "goblin", "libloading", + "mbe", "memmap", - "ra_mbe", "ra_proc_macro", "serde_derive", "test_utils", @@ -946,7 +959,7 @@ dependencies = [ name = "ra_cfg" version = "0.1.0" dependencies = [ - "ra_mbe", + "mbe", "rustc-hash", "syntax", "tt", @@ -1006,12 +1019,12 @@ dependencies = [ "indexmap", "itertools", "log", + "mbe", "once_cell", "profile", "ra_cfg", "ra_db", "ra_hir_expand", - "ra_mbe", "rustc-hash", "smallvec", "stdx", @@ -1027,10 +1040,10 @@ dependencies = [ "arena", "either", "log", + "mbe", "parser", "profile", "ra_db", - "ra_mbe", "rustc-hash", "syntax", "test_utils", @@ -1109,19 +1122,6 @@ dependencies = [ "text_edit", ] -[[package]] -name = "ra_mbe" -version = "0.1.0" -dependencies = [ - "log", - "parser", - "rustc-hash", - "smallvec", - "syntax", - "test_utils", - "tt", -] - [[package]] name = "ra_proc_macro" version = "0.1.0" @@ -1249,6 +1249,7 @@ dependencies = [ "log", "lsp-server", "lsp-types", + "mbe", "mimalloc", "oorandom", "parking_lot", @@ -1262,7 +1263,6 @@ dependencies = [ "ra_hir_ty", "ra_ide", "ra_ide_db", - "ra_mbe", "ra_project_model", "ra_ssr", "rayon", -- cgit v1.2.3 From 68c223872562a8d746d4f1045d508887a0cbca5e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 10:19:09 +0200 Subject: Rename ra_cfg -> cfg --- Cargo.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index a63cd58f2..18c979b39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,6 +112,16 @@ version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +[[package]] +name = "cfg" +version = "0.0.0" +dependencies = [ + "mbe", + "rustc-hash", + "syntax", + "tt", +] + [[package]] name = "cfg-if" version = "0.1.10" @@ -955,22 +965,12 @@ dependencies = [ "text_edit", ] -[[package]] -name = "ra_cfg" -version = "0.1.0" -dependencies = [ - "mbe", - "rustc-hash", - "syntax", - "tt", -] - [[package]] name = "ra_db" version = "0.1.0" dependencies = [ + "cfg", "profile", - "ra_cfg", "rustc-hash", "salsa", "stdx", @@ -1012,6 +1012,7 @@ version = "0.1.0" dependencies = [ "anymap", "arena", + "cfg", "drop_bomb", "either", "expect", @@ -1022,7 +1023,6 @@ dependencies = [ "mbe", "once_cell", "profile", - "ra_cfg", "ra_db", "ra_hir_expand", "rustc-hash", @@ -1082,6 +1082,7 @@ dependencies = [ name = "ra_ide" version = "0.1.0" dependencies = [ + "cfg", "either", "expect", "indexmap", @@ -1090,7 +1091,6 @@ dependencies = [ "oorandom", "profile", "ra_assists", - "ra_cfg", "ra_db", "ra_fmt", "ra_hir", @@ -1141,9 +1141,9 @@ dependencies = [ "anyhow", "arena", "cargo_metadata", + "cfg", "log", "paths", - "ra_cfg", "ra_db", "ra_proc_macro", "rustc-hash", @@ -1240,6 +1240,7 @@ name = "rust-analyzer" version = "0.1.0" dependencies = [ "anyhow", + "cfg", "crossbeam-channel", "env_logger", "expect", @@ -1256,7 +1257,6 @@ dependencies = [ "pico-args", "proc_macro_srv", "profile", - "ra_cfg", "ra_db", "ra_hir", "ra_hir_def", -- cgit v1.2.3