From a015714defd19298632819885679fc6fdd6ea07c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 1 Aug 2020 04:09:52 +0200 Subject: Better JSON serialization in metrics --- Cargo.lock | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 234c31406..c974022a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1831,6 +1831,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "write-json" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b3f9a784c809a99e38d2e825907617cb03bd880d5421153bc4548e9317f59d0" + [[package]] name = "ws2_32-sys" version = "0.2.1" @@ -1852,4 +1858,5 @@ dependencies = [ "quote", "ungrammar", "walkdir", + "write-json", ] -- cgit v1.2.3 From bff8dd094958f1abe2fcfe8fe9f15dc7a7e6b53e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 1 Aug 2020 13:47:19 +0200 Subject: Update grammar --- Cargo.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index c974022a2..de361cc23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,9 +279,9 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] name = "drop_bomb" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b26e475fd29098530e709294e94e661974c851aed42512793f120fed4e199f" +checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "either" @@ -1622,9 +1622,9 @@ checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" [[package]] name = "tracing" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9" +checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178" dependencies = [ "cfg-if", "tracing-attributes", @@ -1644,9 +1644,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ae75f0d28ae10786f3b1895c55fe72e79928fd5ccdebb5438c75e93fec178f" +checksum = "b2734b5a028fa697686f16c6d18c2c6a3c7e41513f9a213abb6754c4acb3c8d7" dependencies = [ "lazy_static", ] @@ -1674,9 +1674,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f5dd7095c2481b7b3cbed71c8de53085fb3542bc3c2b4c73cba43e8f11c7ba" +checksum = "f7b33f8b2ef2ab0c3778c12646d9c42a24f7772bee4cdafc72199644a9f58fdc" dependencies = [ "ansi_term", "chrono", @@ -1708,9 +1708,9 @@ dependencies = [ [[package]] name = "ungrammar" -version = "0.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee12e4891ab3acc2d95d5023022ace22020247bb8a8d1ece875a443f7dab37d" +checksum = "c4e20e58a08ee1bcf8a4695cf74550cf054d6c489105f594beacb2c684210aad" [[package]] name = "unicode-bidi" @@ -1833,9 +1833,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "write-json" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b3f9a784c809a99e38d2e825907617cb03bd880d5421153bc4548e9317f59d0" +checksum = "06069a848f95fceae3e5e03c0ddc8cb78452b56654ee0c8e68f938cf790fb9e3" [[package]] name = "ws2_32-sys" -- cgit v1.2.3 From edd4a83ee3c887670afd077eeb1ddb8ce1976108 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 22 Jul 2020 18:44:40 +0200 Subject: Use salsa's purge to account for all memory --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index de361cc23..451928c27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -318,9 +318,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b" +checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e" dependencies = [ "cfg-if", "libc", @@ -1371,9 +1371,9 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "salsa" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cdc109fcc9e9450c7ef47fb7474e99bffd51799da03ed0a6c7f0e2cb3848a6" +checksum = "9ab29056d4fb4048a5f0d169c9b6e5526160c9ec37aded5a6879c2c9c445a8e4" dependencies = [ "crossbeam-utils", "indexmap", @@ -1388,9 +1388,9 @@ dependencies = [ [[package]] name = "salsa-macros" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c280ac85b15ac214b86ac4b407626a48e6a1c4f90769a582fec74aa57942b9f" +checksum = "a1c3aec007c63c4ed4cd7a018529fb0b5575c4562575fc6a40d6cd2ae0b792ef" dependencies = [ "heck", "proc-macro2", @@ -1533,9 +1533,9 @@ version = "0.1.0" [[package]] name = "syn" -version = "1.0.36" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250" +checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" dependencies = [ "proc-macro2", "quote", @@ -1644,9 +1644,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2734b5a028fa697686f16c6d18c2c6a3c7e41513f9a213abb6754c4acb3c8d7" +checksum = "d593f98af59ebc017c0648f0117525db358745a8894a8d684e185ba3f45954f9" dependencies = [ "lazy_static", ] -- cgit v1.2.3 From 4591bd458dd0d650f2288e911b598c0a571dcdfd Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Wed, 5 Aug 2020 22:24:23 -0400 Subject: Update chalk --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 451928c27..dc49fc4bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -125,9 +125,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "chalk-derive" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "654c611946ba2629c5028cb7708687af975faf2c29d731824cb294c873df4697" +checksum = "c1df0dbb57d74b4acd20f20fa66ab2acd09776b79eaeb9d8f947b2f3e01c40bf" dependencies = [ "proc-macro2", "quote", @@ -137,9 +137,9 @@ dependencies = [ [[package]] name = "chalk-ir" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5341fbc654ca886b73b804a36aebf0e621057ccc1a68e9815b5b39b3ac9ae8" +checksum = "44361a25dbdb1dc428f56ad7a3c21ba9ca12f3225c26a47919ff6fcb10a583d4" dependencies = [ "chalk-derive", "lazy_static", @@ -147,9 +147,9 @@ dependencies = [ [[package]] name = "chalk-recursive" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4484807b155b5a411e6135d330295f9ba5042e2920b8712c6574ca6ea91e9ee5" +checksum = "dd89556b98de156d5eaf21077d297cd2198628f10f2df140798ea3a5dd84bc86" dependencies = [ "chalk-derive", "chalk-ir", @@ -160,9 +160,9 @@ dependencies = [ [[package]] name = "chalk-solve" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "281f82facd2538997fbe52132b1941ed213d266748215c31d15f62a8664429ad" +checksum = "a886da37a0dc457057d86f78f026f7a09c6d8088aa13f4f4127fdb8dc80119a3" dependencies = [ "chalk-derive", "chalk-ir", -- cgit v1.2.3 From 9842bbfd275a65072bbfe05405daa73f7c27b2de Mon Sep 17 00:00:00 2001 From: kjeremy Date: Mon, 10 Aug 2020 10:56:16 -0400 Subject: cargo update --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index dc49fc4bd..a094ec4f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -418,9 +418,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb" +checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" dependencies = [ "autocfg", ] @@ -465,9 +465,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7" +checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9" dependencies = [ "autocfg", "hashbrown", @@ -871,9 +871,9 @@ dependencies = [ [[package]] name = "pico-args" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1eee8b1f4966c8343d7ca0f5a8452cd35d5610a2e0efbe2a68cae44bef2046" +checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1" [[package]] name = "plain" @@ -1694,9 +1694,9 @@ dependencies = [ [[package]] name = "tracing-tree" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee7f0f53ed2093971a698db799ef56a2dfd89b32e3aeb5165f0e637a02be04" +checksum = "e1a3dc4774db3a6b2d66a4f8d8de670e874ec3ed55615860c994927419b32c5f" dependencies = [ "ansi_term", "atty", -- cgit v1.2.3 From 67b2b3d0ce59fe082b442de30627c3386048eaca Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 12 Aug 2020 11:49:49 +0200 Subject: Fix build on musl and test it in CI --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index a094ec4f7..265889162 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -852,9 +852,9 @@ dependencies = [ [[package]] name = "perf-event-open-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95db63e37862bc1b842135d2234ef9418f222cc660c6752f45e7cf9ddfb97f96" +checksum = "83e7183862f36d10263d0a1ccaef50fef734ade948bf026afd1bd97355c78273" dependencies = [ "libc", ] -- cgit v1.2.3 From 98baa9b569b49162392ed4149dd435854fe941b8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 16:22:05 +0200 Subject: Rename ra_arena --- Cargo.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 265889162..ab1698b11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,6 +45,10 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" +[[package]] +name = "arena" +version = "0.0.0" + [[package]] name = "arrayvec" version = "0.5.1" @@ -899,10 +903,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "ra_arena" -version = "0.1.0" - [[package]] name = "ra_assists" version = "0.1.0" @@ -977,6 +977,7 @@ name = "ra_hir_def" version = "0.1.0" dependencies = [ "anymap", + "arena", "drop_bomb", "either", "expect", @@ -985,7 +986,6 @@ dependencies = [ "itertools", "log", "once_cell", - "ra_arena", "ra_cfg", "ra_db", "ra_hir_expand", @@ -1003,9 +1003,9 @@ dependencies = [ name = "ra_hir_expand" version = "0.1.0" dependencies = [ + "arena", "either", "log", - "ra_arena", "ra_db", "ra_mbe", "ra_parser", @@ -1020,6 +1020,7 @@ dependencies = [ name = "ra_hir_ty" version = "0.1.0" dependencies = [ + "arena", "arrayvec", "chalk-ir", "chalk-recursive", @@ -1028,7 +1029,6 @@ dependencies = [ "expect", "itertools", "log", - "ra_arena", "ra_db", "ra_hir_def", "ra_hir_expand", @@ -1141,12 +1141,12 @@ dependencies = [ name = "ra_prof" version = "0.1.0" dependencies = [ + "arena", "backtrace", "cfg-if", "libc", "once_cell", "perf-event", - "ra_arena", ] [[package]] @@ -1154,10 +1154,10 @@ name = "ra_project_model" version = "0.1.0" dependencies = [ "anyhow", + "arena", "cargo_metadata", "log", "paths", - "ra_arena", "ra_cfg", "ra_db", "ra_proc_macro", -- cgit v1.2.3 From 208b7bd7ba687fb570feb1b89219f14c63712ce8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 16:32:36 +0200 Subject: Rename ra_prof -> profile --- Cargo.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index ab1698b11..c2a0457c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -894,6 +894,18 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "profile" +version = "0.0.0" +dependencies = [ + "arena", + "backtrace", + "cfg-if", + "libc", + "once_cell", + "perf-event", +] + [[package]] name = "quote" version = "1.0.7" @@ -909,11 +921,11 @@ version = "0.1.0" dependencies = [ "either", "itertools", + "profile", "ra_db", "ra_fmt", "ra_hir", "ra_ide_db", - "ra_prof", "ra_syntax", "ra_text_edit", "rustc-hash", @@ -935,8 +947,8 @@ dependencies = [ name = "ra_db" version = "0.1.0" dependencies = [ + "profile", "ra_cfg", - "ra_prof", "ra_syntax", "ra_tt", "rustc-hash", @@ -962,11 +974,11 @@ dependencies = [ "either", "itertools", "log", + "profile", "ra_db", "ra_hir_def", "ra_hir_expand", "ra_hir_ty", - "ra_prof", "ra_syntax", "rustc-hash", "stdx", @@ -986,11 +998,11 @@ dependencies = [ "itertools", "log", "once_cell", + "profile", "ra_cfg", "ra_db", "ra_hir_expand", "ra_mbe", - "ra_prof", "ra_syntax", "ra_tt", "rustc-hash", @@ -1006,10 +1018,10 @@ dependencies = [ "arena", "either", "log", + "profile", "ra_db", "ra_mbe", "ra_parser", - "ra_prof", "ra_syntax", "ra_tt", "rustc-hash", @@ -1029,10 +1041,10 @@ dependencies = [ "expect", "itertools", "log", + "profile", "ra_db", "ra_hir_def", "ra_hir_expand", - "ra_prof", "ra_syntax", "rustc-hash", "scoped-tls", @@ -1054,13 +1066,13 @@ dependencies = [ "itertools", "log", "oorandom", + "profile", "ra_assists", "ra_cfg", "ra_db", "ra_fmt", "ra_hir", "ra_ide_db", - "ra_prof", "ra_ssr", "ra_syntax", "ra_text_edit", @@ -1077,9 +1089,9 @@ dependencies = [ "fst", "log", "once_cell", + "profile", "ra_db", "ra_hir", - "ra_prof", "ra_syntax", "ra_text_edit", "rayon", @@ -1137,18 +1149,6 @@ dependencies = [ "test_utils", ] -[[package]] -name = "ra_prof" -version = "0.1.0" -dependencies = [ - "arena", - "backtrace", - "cfg-if", - "libc", - "once_cell", - "perf-event", -] - [[package]] name = "ra_project_model" version = "0.1.0" @@ -1314,6 +1314,7 @@ dependencies = [ "oorandom", "parking_lot", "pico-args", + "profile", "ra_cfg", "ra_db", "ra_hir", @@ -1323,7 +1324,6 @@ dependencies = [ "ra_ide_db", "ra_mbe", "ra_proc_macro_srv", - "ra_prof", "ra_project_model", "ra_ssr", "ra_syntax", -- cgit v1.2.3 From 550d7fbe3cbf2af4a47fca6c9bbefaf798cd7b7b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 16:46:20 +0200 Subject: Rename ra_tt -> tt --- Cargo.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index c2a0457c7..598b739c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -939,8 +939,8 @@ version = "0.1.0" dependencies = [ "ra_mbe", "ra_syntax", - "ra_tt", "rustc-hash", + "tt", ] [[package]] @@ -950,11 +950,11 @@ dependencies = [ "profile", "ra_cfg", "ra_syntax", - "ra_tt", "rustc-hash", "salsa", "stdx", "test_utils", + "tt", "vfs", ] @@ -1004,11 +1004,11 @@ dependencies = [ "ra_hir_expand", "ra_mbe", "ra_syntax", - "ra_tt", "rustc-hash", "smallvec", "stdx", "test_utils", + "tt", ] [[package]] @@ -1023,9 +1023,9 @@ dependencies = [ "ra_mbe", "ra_parser", "ra_syntax", - "ra_tt", "rustc-hash", "test_utils", + "tt", ] [[package]] @@ -1107,10 +1107,10 @@ dependencies = [ "log", "ra_parser", "ra_syntax", - "ra_tt", "rustc-hash", "smallvec", "test_utils", + "tt", ] [[package]] @@ -1127,9 +1127,9 @@ dependencies = [ "crossbeam-channel", "jod-thread", "log", - "ra_tt", "serde", "serde_json", + "tt", ] [[package]] @@ -1144,9 +1144,9 @@ dependencies = [ "ra_mbe", "ra_proc_macro", "ra_toolchain", - "ra_tt", "serde_derive", "test_utils", + "tt", ] [[package]] @@ -1217,14 +1217,6 @@ dependencies = [ "home", ] -[[package]] -name = "ra_tt" -version = "0.1.0" -dependencies = [ - "smol_str", - "stdx", -] - [[package]] name = "rayon" version = "1.3.1" @@ -1329,7 +1321,6 @@ dependencies = [ "ra_syntax", "ra_text_edit", "ra_toolchain", - "ra_tt", "rayon", "rustc-hash", "serde", @@ -1337,6 +1328,7 @@ dependencies = [ "stdx", "test_utils", "threadpool", + "tt", "vfs", "vfs-notify", "winapi 0.3.9", @@ -1706,6 +1698,14 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "tt" +version = "0.0.0" +dependencies = [ + "smol_str", + "stdx", +] + [[package]] name = "ungrammar" version = "1.1.1" -- cgit v1.2.3 From 8d34262956059aca7e6fded351a9299b3581a5cf Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 16:52:28 +0200 Subject: Rename ra_toolchain -> toolchain --- Cargo.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 598b739c7..c48c6a597 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -358,8 +358,8 @@ dependencies = [ "crossbeam-channel", "jod-thread", "log", - "ra_toolchain", "serde_json", + "toolchain", ] [[package]] @@ -1143,9 +1143,9 @@ dependencies = [ "memmap", "ra_mbe", "ra_proc_macro", - "ra_toolchain", "serde_derive", "test_utils", + "toolchain", "tt", ] @@ -1161,11 +1161,11 @@ dependencies = [ "ra_cfg", "ra_db", "ra_proc_macro", - "ra_toolchain", "rustc-hash", "serde", "serde_json", "stdx", + "toolchain", ] [[package]] @@ -1210,13 +1210,6 @@ dependencies = [ "text-size", ] -[[package]] -name = "ra_toolchain" -version = "0.1.0" -dependencies = [ - "home", -] - [[package]] name = "rayon" version = "1.3.1" @@ -1320,7 +1313,6 @@ dependencies = [ "ra_ssr", "ra_syntax", "ra_text_edit", - "ra_toolchain", "rayon", "rustc-hash", "serde", @@ -1328,6 +1320,7 @@ dependencies = [ "stdx", "test_utils", "threadpool", + "toolchain", "tt", "vfs", "vfs-notify", @@ -1612,6 +1605,13 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +[[package]] +name = "toolchain" +version = "0.0.0" +dependencies = [ + "home", +] + [[package]] name = "tracing" version = "0.1.18" -- cgit v1.2.3 From 7510048ec0a5d5e7136e3ea258954eb244d15baf Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 16:58:56 +0200 Subject: Cleanup TextEdit API --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index c48c6a597..daa872546 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1205,7 +1205,7 @@ dependencies = [ [[package]] name = "ra_text_edit" -version = "0.1.0" +version = "0.0.0" dependencies = [ "text-size", ] -- cgit v1.2.3 From 6dafc13f5f776980cd2560fb79d3d4790811c96d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 17:03:06 +0200 Subject: Rename ra_text_edit -> text_edit --- Cargo.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index daa872546..4a6a65934 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -927,10 +927,10 @@ dependencies = [ "ra_hir", "ra_ide_db", "ra_syntax", - "ra_text_edit", "rustc-hash", "stdx", "test_utils", + "text_edit", ] [[package]] @@ -1075,10 +1075,10 @@ dependencies = [ "ra_ide_db", "ra_ssr", "ra_syntax", - "ra_text_edit", "rustc-hash", "stdx", "test_utils", + "text_edit", ] [[package]] @@ -1093,11 +1093,11 @@ dependencies = [ "ra_db", "ra_hir", "ra_syntax", - "ra_text_edit", "rayon", "rustc-hash", "stdx", "test_utils", + "text_edit", ] [[package]] @@ -1177,9 +1177,9 @@ dependencies = [ "ra_hir", "ra_ide_db", "ra_syntax", - "ra_text_edit", "rustc-hash", "test_utils", + "text_edit", ] [[package]] @@ -1191,7 +1191,6 @@ dependencies = [ "itertools", "once_cell", "ra_parser", - "ra_text_edit", "rayon", "rowan", "rustc-ap-rustc_lexer", @@ -1200,16 +1199,10 @@ dependencies = [ "smol_str", "stdx", "test_utils", + "text_edit", "walkdir", ] -[[package]] -name = "ra_text_edit" -version = "0.0.0" -dependencies = [ - "text-size", -] - [[package]] name = "rayon" version = "1.3.1" @@ -1312,13 +1305,13 @@ dependencies = [ "ra_project_model", "ra_ssr", "ra_syntax", - "ra_text_edit", "rayon", "rustc-hash", "serde", "serde_json", "stdx", "test_utils", + "text_edit", "threadpool", "toolchain", "tt", @@ -1565,6 +1558,13 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03e7efdedc3bc78cb2337f1e2785c39e45f5ef762d9e4ebb137fff7380a6d8a" +[[package]] +name = "text_edit" +version = "0.0.0" +dependencies = [ + "text-size", +] + [[package]] name = "thin-dst" version = "1.1.0" -- cgit v1.2.3 From 50a02eb3593591a02677e1b56f24d7ff0459b9d0 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 17:06:49 +0200 Subject: Rename ra_parser -> parser --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 4a6a65934..095127b99 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -834,6 +834,13 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parser" +version = "0.0.0" +dependencies = [ + "drop_bomb", +] + [[package]] name = "paths" version = "0.1.0" @@ -1018,10 +1025,10 @@ dependencies = [ "arena", "either", "log", + "parser", "profile", "ra_db", "ra_mbe", - "ra_parser", "ra_syntax", "rustc-hash", "test_utils", @@ -1105,7 +1112,7 @@ name = "ra_mbe" version = "0.1.0" dependencies = [ "log", - "ra_parser", + "parser", "ra_syntax", "rustc-hash", "smallvec", @@ -1113,13 +1120,6 @@ dependencies = [ "tt", ] -[[package]] -name = "ra_parser" -version = "0.1.0" -dependencies = [ - "drop_bomb", -] - [[package]] name = "ra_proc_macro" version = "0.1.0" @@ -1190,7 +1190,7 @@ dependencies = [ "expect", "itertools", "once_cell", - "ra_parser", + "parser", "rayon", "rowan", "rustc-ap-rustc_lexer", -- cgit v1.2.3 From a1c187eef3ba08076aedb5154929f7eda8d1b424 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 12 Aug 2020 18:26:51 +0200 Subject: Rename ra_syntax -> syntax --- Cargo.lock | 68 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 095127b99..c95ef002d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -933,9 +933,9 @@ dependencies = [ "ra_fmt", "ra_hir", "ra_ide_db", - "ra_syntax", "rustc-hash", "stdx", + "syntax", "test_utils", "text_edit", ] @@ -945,8 +945,8 @@ name = "ra_cfg" version = "0.1.0" dependencies = [ "ra_mbe", - "ra_syntax", "rustc-hash", + "syntax", "tt", ] @@ -956,10 +956,10 @@ version = "0.1.0" dependencies = [ "profile", "ra_cfg", - "ra_syntax", "rustc-hash", "salsa", "stdx", + "syntax", "test_utils", "tt", "vfs", @@ -970,7 +970,7 @@ name = "ra_fmt" version = "0.1.0" dependencies = [ "itertools", - "ra_syntax", + "syntax", ] [[package]] @@ -986,9 +986,9 @@ dependencies = [ "ra_hir_def", "ra_hir_expand", "ra_hir_ty", - "ra_syntax", "rustc-hash", "stdx", + "syntax", ] [[package]] @@ -1010,10 +1010,10 @@ dependencies = [ "ra_db", "ra_hir_expand", "ra_mbe", - "ra_syntax", "rustc-hash", "smallvec", "stdx", + "syntax", "test_utils", "tt", ] @@ -1029,8 +1029,8 @@ dependencies = [ "profile", "ra_db", "ra_mbe", - "ra_syntax", "rustc-hash", + "syntax", "test_utils", "tt", ] @@ -1052,11 +1052,11 @@ dependencies = [ "ra_db", "ra_hir_def", "ra_hir_expand", - "ra_syntax", "rustc-hash", "scoped-tls", "smallvec", "stdx", + "syntax", "test_utils", "tracing", "tracing-subscriber", @@ -1081,9 +1081,9 @@ dependencies = [ "ra_hir", "ra_ide_db", "ra_ssr", - "ra_syntax", "rustc-hash", "stdx", + "syntax", "test_utils", "text_edit", ] @@ -1099,10 +1099,10 @@ dependencies = [ "profile", "ra_db", "ra_hir", - "ra_syntax", "rayon", "rustc-hash", "stdx", + "syntax", "test_utils", "text_edit", ] @@ -1113,9 +1113,9 @@ version = "0.1.0" dependencies = [ "log", "parser", - "ra_syntax", "rustc-hash", "smallvec", + "syntax", "test_utils", "tt", ] @@ -1176,33 +1176,12 @@ dependencies = [ "ra_db", "ra_hir", "ra_ide_db", - "ra_syntax", "rustc-hash", + "syntax", "test_utils", "text_edit", ] -[[package]] -name = "ra_syntax" -version = "0.1.0" -dependencies = [ - "arrayvec", - "expect", - "itertools", - "once_cell", - "parser", - "rayon", - "rowan", - "rustc-ap-rustc_lexer", - "rustc-hash", - "serde", - "smol_str", - "stdx", - "test_utils", - "text_edit", - "walkdir", -] - [[package]] name = "rayon" version = "1.3.1" @@ -1304,12 +1283,12 @@ dependencies = [ "ra_proc_macro_srv", "ra_project_model", "ra_ssr", - "ra_syntax", "rayon", "rustc-hash", "serde", "serde_json", "stdx", + "syntax", "test_utils", "text_edit", "threadpool", @@ -1532,6 +1511,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "syntax" +version = "0.0.0" +dependencies = [ + "arrayvec", + "expect", + "itertools", + "once_cell", + "parser", + "rayon", + "rowan", + "rustc-ap-rustc_lexer", + "rustc-hash", + "serde", + "smol_str", + "stdx", + "test_utils", + "text_edit", + "walkdir", +] + [[package]] name = "termcolor" version = "1.1.0" -- cgit v1.2.3 From 349e6c62ada1fa45a8b80edb877b5e7c9d0c306d Mon Sep 17 00:00:00 2001 From: Pavan Kumar Sunkara Date: Thu, 13 Aug 2020 02:57:26 +0200 Subject: Rename ra_proc_macro_srv -> proc_macro_srv --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index c95ef002d..efc17c430 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1133,8 +1133,8 @@ dependencies = [ ] [[package]] -name = "ra_proc_macro_srv" -version = "0.1.0" +name = "proc_macro_srv" +version = "0.0.0" dependencies = [ "cargo_metadata", "difference", @@ -1280,7 +1280,7 @@ dependencies = [ "ra_ide", "ra_ide_db", "ra_mbe", - "ra_proc_macro_srv", + "proc_macro_srv", "ra_project_model", "ra_ssr", "rayon", -- cgit v1.2.3 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 From c81f6230da98fd3e3fa91c0896d65922a1ed4a24 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 11:56:11 +0200 Subject: Remove ra_fmt crate --- Cargo.lock | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 18c979b39..5f7b85b05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -955,7 +955,6 @@ dependencies = [ "itertools", "profile", "ra_db", - "ra_fmt", "ra_hir", "ra_ide_db", "rustc-hash", @@ -980,14 +979,6 @@ dependencies = [ "vfs", ] -[[package]] -name = "ra_fmt" -version = "0.1.0" -dependencies = [ - "itertools", - "syntax", -] - [[package]] name = "ra_hir" version = "0.1.0" @@ -1092,7 +1083,6 @@ dependencies = [ "profile", "ra_assists", "ra_db", - "ra_fmt", "ra_hir", "ra_ide_db", "ra_ssr", -- cgit v1.2.3 From eac24d52e672c0a9c118e8969bf1b839c3e7f1f3 Mon Sep 17 00:00:00 2001 From: Pavan Kumar Sunkara Date: Thu, 13 Aug 2020 12:05:30 +0200 Subject: Rename ra_project_model -> project_model --- Cargo.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 18c979b39..f72d9e022 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -938,6 +938,25 @@ dependencies = [ "perf-event", ] +[[package]] +name = "project_model" +version = "0.0.0" +dependencies = [ + "anyhow", + "arena", + "cargo_metadata", + "cfg", + "log", + "paths", + "ra_db", + "ra_proc_macro", + "rustc-hash", + "serde", + "serde_json", + "stdx", + "toolchain", +] + [[package]] name = "quote" version = "1.0.7" @@ -1134,25 +1153,6 @@ dependencies = [ "tt", ] -[[package]] -name = "ra_project_model" -version = "0.1.0" -dependencies = [ - "anyhow", - "arena", - "cargo_metadata", - "cfg", - "log", - "paths", - "ra_db", - "ra_proc_macro", - "rustc-hash", - "serde", - "serde_json", - "stdx", - "toolchain", -] - [[package]] name = "ra_ssr" version = "0.1.0" @@ -1257,13 +1257,13 @@ dependencies = [ "pico-args", "proc_macro_srv", "profile", + "project_model", "ra_db", "ra_hir", "ra_hir_def", "ra_hir_ty", "ra_ide", "ra_ide_db", - "ra_project_model", "ra_ssr", "rayon", "rustc-hash", -- cgit v1.2.3 From 2119dc23e80d77f1abc789e3d99c34d429e17905 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 12:07:28 +0200 Subject: Rename ra_proc_macro -> proc_macro_api --- Cargo.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 89d0a60ec..9878dd88f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -909,6 +909,18 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "proc_macro_api" +version = "0.1.0" +dependencies = [ + "crossbeam-channel", + "jod-thread", + "log", + "serde", + "serde_json", + "tt", +] + [[package]] name = "proc_macro_srv" version = "0.0.0" @@ -919,7 +931,7 @@ dependencies = [ "libloading", "mbe", "memmap", - "ra_proc_macro", + "proc_macro_api", "serde_derive", "test_utils", "toolchain", @@ -948,8 +960,8 @@ dependencies = [ "cfg", "log", "paths", + "proc_macro_api", "ra_db", - "ra_proc_macro", "rustc-hash", "serde", "serde_json", @@ -1131,18 +1143,6 @@ dependencies = [ "text_edit", ] -[[package]] -name = "ra_proc_macro" -version = "0.1.0" -dependencies = [ - "crossbeam-channel", - "jod-thread", - "log", - "serde", - "serde_json", - "tt", -] - [[package]] name = "ra_ssr" version = "0.1.0" -- cgit v1.2.3 From ed20a857f485a471369cd99b843af19a4d875ad0 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:25:38 +0200 Subject: Rename ra_db -> base_db --- Cargo.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 9878dd88f..a99dd6e04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -83,6 +83,21 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +[[package]] +name = "base_db" +version = "0.0.0" +dependencies = [ + "cfg", + "profile", + "rustc-hash", + "salsa", + "stdx", + "syntax", + "test_utils", + "tt", + "vfs", +] + [[package]] name = "bitflags" version = "1.2.1" @@ -956,12 +971,12 @@ version = "0.0.0" dependencies = [ "anyhow", "arena", + "base_db", "cargo_metadata", "cfg", "log", "paths", "proc_macro_api", - "ra_db", "rustc-hash", "serde", "serde_json", @@ -982,10 +997,10 @@ dependencies = [ name = "ra_assists" version = "0.1.0" dependencies = [ + "base_db", "either", "itertools", "profile", - "ra_db", "ra_hir", "ra_ide_db", "rustc-hash", @@ -995,31 +1010,16 @@ dependencies = [ "text_edit", ] -[[package]] -name = "ra_db" -version = "0.1.0" -dependencies = [ - "cfg", - "profile", - "rustc-hash", - "salsa", - "stdx", - "syntax", - "test_utils", - "tt", - "vfs", -] - [[package]] name = "ra_hir" version = "0.1.0" dependencies = [ "arrayvec", + "base_db", "either", "itertools", "log", "profile", - "ra_db", "ra_hir_def", "ra_hir_expand", "ra_hir_ty", @@ -1034,6 +1034,7 @@ version = "0.1.0" dependencies = [ "anymap", "arena", + "base_db", "cfg", "drop_bomb", "either", @@ -1045,7 +1046,6 @@ dependencies = [ "mbe", "once_cell", "profile", - "ra_db", "ra_hir_expand", "rustc-hash", "smallvec", @@ -1060,12 +1060,12 @@ name = "ra_hir_expand" version = "0.1.0" dependencies = [ "arena", + "base_db", "either", "log", "mbe", "parser", "profile", - "ra_db", "rustc-hash", "syntax", "test_utils", @@ -1078,6 +1078,7 @@ version = "0.1.0" dependencies = [ "arena", "arrayvec", + "base_db", "chalk-ir", "chalk-recursive", "chalk-solve", @@ -1086,7 +1087,6 @@ dependencies = [ "itertools", "log", "profile", - "ra_db", "ra_hir_def", "ra_hir_expand", "rustc-hash", @@ -1104,6 +1104,7 @@ dependencies = [ name = "ra_ide" version = "0.1.0" dependencies = [ + "base_db", "cfg", "either", "expect", @@ -1113,7 +1114,6 @@ dependencies = [ "oorandom", "profile", "ra_assists", - "ra_db", "ra_hir", "ra_ide_db", "ra_ssr", @@ -1128,12 +1128,12 @@ dependencies = [ name = "ra_ide_db" version = "0.1.0" dependencies = [ + "base_db", "either", "fst", "log", "once_cell", "profile", - "ra_db", "ra_hir", "rayon", "rustc-hash", @@ -1147,8 +1147,8 @@ dependencies = [ name = "ra_ssr" version = "0.1.0" dependencies = [ + "base_db", "expect", - "ra_db", "ra_hir", "ra_ide_db", "rustc-hash", @@ -1230,6 +1230,7 @@ name = "rust-analyzer" version = "0.1.0" dependencies = [ "anyhow", + "base_db", "cfg", "crossbeam-channel", "env_logger", @@ -1248,7 +1249,6 @@ dependencies = [ "proc_macro_srv", "profile", "project_model", - "ra_db", "ra_hir", "ra_hir_def", "ra_hir_ty", -- cgit v1.2.3 From b7aa4898e0841ab8199643f89a0caa967b698ca8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:26:29 +0200 Subject: Rename ra_hir_expand -> hir_expand --- Cargo.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index a99dd6e04..768c3293d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,6 +463,23 @@ dependencies = [ "libc", ] +[[package]] +name = "hir_expand" +version = "0.0.0" +dependencies = [ + "arena", + "base_db", + "either", + "log", + "mbe", + "parser", + "profile", + "rustc-hash", + "syntax", + "test_utils", + "tt", +] + [[package]] name = "home" version = "0.5.3" @@ -1017,11 +1034,11 @@ dependencies = [ "arrayvec", "base_db", "either", + "hir_expand", "itertools", "log", "profile", "ra_hir_def", - "ra_hir_expand", "ra_hir_ty", "rustc-hash", "stdx", @@ -1040,13 +1057,13 @@ dependencies = [ "either", "expect", "fst", + "hir_expand", "indexmap", "itertools", "log", "mbe", "once_cell", "profile", - "ra_hir_expand", "rustc-hash", "smallvec", "stdx", @@ -1055,23 +1072,6 @@ dependencies = [ "tt", ] -[[package]] -name = "ra_hir_expand" -version = "0.1.0" -dependencies = [ - "arena", - "base_db", - "either", - "log", - "mbe", - "parser", - "profile", - "rustc-hash", - "syntax", - "test_utils", - "tt", -] - [[package]] name = "ra_hir_ty" version = "0.1.0" @@ -1084,11 +1084,11 @@ dependencies = [ "chalk-solve", "ena", "expect", + "hir_expand", "itertools", "log", "profile", "ra_hir_def", - "ra_hir_expand", "rustc-hash", "scoped-tls", "smallvec", -- cgit v1.2.3 From b28c54a2c239acd73f2eea80fda9ee3960d2c046 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:28:27 +0200 Subject: Rename ra_hir_def -> hir_def --- Cargo.lock | 60 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 768c3293d..702bd5191 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,6 +463,33 @@ dependencies = [ "libc", ] +[[package]] +name = "hir_def" +version = "0.0.0" +dependencies = [ + "anymap", + "arena", + "base_db", + "cfg", + "drop_bomb", + "either", + "expect", + "fst", + "hir_expand", + "indexmap", + "itertools", + "log", + "mbe", + "once_cell", + "profile", + "rustc-hash", + "smallvec", + "stdx", + "syntax", + "test_utils", + "tt", +] + [[package]] name = "hir_expand" version = "0.0.0" @@ -1034,44 +1061,17 @@ dependencies = [ "arrayvec", "base_db", "either", + "hir_def", "hir_expand", "itertools", "log", "profile", - "ra_hir_def", "ra_hir_ty", "rustc-hash", "stdx", "syntax", ] -[[package]] -name = "ra_hir_def" -version = "0.1.0" -dependencies = [ - "anymap", - "arena", - "base_db", - "cfg", - "drop_bomb", - "either", - "expect", - "fst", - "hir_expand", - "indexmap", - "itertools", - "log", - "mbe", - "once_cell", - "profile", - "rustc-hash", - "smallvec", - "stdx", - "syntax", - "test_utils", - "tt", -] - [[package]] name = "ra_hir_ty" version = "0.1.0" @@ -1084,11 +1084,11 @@ dependencies = [ "chalk-solve", "ena", "expect", + "hir_def", "hir_expand", "itertools", "log", "profile", - "ra_hir_def", "rustc-hash", "scoped-tls", "smallvec", @@ -1236,6 +1236,7 @@ dependencies = [ "env_logger", "expect", "flycheck", + "hir_def", "itertools", "jod-thread", "log", @@ -1250,7 +1251,6 @@ dependencies = [ "profile", "project_model", "ra_hir", - "ra_hir_def", "ra_hir_ty", "ra_ide", "ra_ide_db", -- cgit v1.2.3 From 6a77ec7bbe6ddbf663dce9529d11d1bb56c5489a Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:35:29 +0200 Subject: Rename ra_hir_ty -> hir_ty --- Cargo.lock | 60 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 702bd5191..6ecea3647 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -507,6 +507,34 @@ dependencies = [ "tt", ] +[[package]] +name = "hir_ty" +version = "0.0.0" +dependencies = [ + "arena", + "arrayvec", + "base_db", + "chalk-ir", + "chalk-recursive", + "chalk-solve", + "ena", + "expect", + "hir_def", + "hir_expand", + "itertools", + "log", + "profile", + "rustc-hash", + "scoped-tls", + "smallvec", + "stdx", + "syntax", + "test_utils", + "tracing", + "tracing-subscriber", + "tracing-tree", +] + [[package]] name = "home" version = "0.5.3" @@ -1063,43 +1091,15 @@ dependencies = [ "either", "hir_def", "hir_expand", + "hir_ty", "itertools", "log", "profile", - "ra_hir_ty", "rustc-hash", "stdx", "syntax", ] -[[package]] -name = "ra_hir_ty" -version = "0.1.0" -dependencies = [ - "arena", - "arrayvec", - "base_db", - "chalk-ir", - "chalk-recursive", - "chalk-solve", - "ena", - "expect", - "hir_def", - "hir_expand", - "itertools", - "log", - "profile", - "rustc-hash", - "scoped-tls", - "smallvec", - "stdx", - "syntax", - "test_utils", - "tracing", - "tracing-subscriber", - "tracing-tree", -] - [[package]] name = "ra_ide" version = "0.1.0" @@ -1237,6 +1237,7 @@ dependencies = [ "expect", "flycheck", "hir_def", + "hir_ty", "itertools", "jod-thread", "log", @@ -1251,7 +1252,6 @@ dependencies = [ "profile", "project_model", "ra_hir", - "ra_hir_ty", "ra_ide", "ra_ide_db", "ra_ssr", -- cgit v1.2.3 From ae71a631fd657368e8593feb5e025d23147afe60 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:36:55 +0200 Subject: Rename ra_hir -> hir --- Cargo.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 6ecea3647..ae71ea9fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,6 +463,24 @@ dependencies = [ "libc", ] +[[package]] +name = "hir" +version = "0.0.0" +dependencies = [ + "arrayvec", + "base_db", + "either", + "hir_def", + "hir_expand", + "hir_ty", + "itertools", + "log", + "profile", + "rustc-hash", + "stdx", + "syntax", +] + [[package]] name = "hir_def" version = "0.0.0" @@ -1071,9 +1089,9 @@ version = "0.1.0" dependencies = [ "base_db", "either", + "hir", "itertools", "profile", - "ra_hir", "ra_ide_db", "rustc-hash", "stdx", @@ -1082,24 +1100,6 @@ dependencies = [ "text_edit", ] -[[package]] -name = "ra_hir" -version = "0.1.0" -dependencies = [ - "arrayvec", - "base_db", - "either", - "hir_def", - "hir_expand", - "hir_ty", - "itertools", - "log", - "profile", - "rustc-hash", - "stdx", - "syntax", -] - [[package]] name = "ra_ide" version = "0.1.0" @@ -1108,13 +1108,13 @@ dependencies = [ "cfg", "either", "expect", + "hir", "indexmap", "itertools", "log", "oorandom", "profile", "ra_assists", - "ra_hir", "ra_ide_db", "ra_ssr", "rustc-hash", @@ -1131,10 +1131,10 @@ dependencies = [ "base_db", "either", "fst", + "hir", "log", "once_cell", "profile", - "ra_hir", "rayon", "rustc-hash", "stdx", @@ -1149,7 +1149,7 @@ version = "0.1.0" dependencies = [ "base_db", "expect", - "ra_hir", + "hir", "ra_ide_db", "rustc-hash", "syntax", @@ -1236,6 +1236,7 @@ dependencies = [ "env_logger", "expect", "flycheck", + "hir", "hir_def", "hir_ty", "itertools", @@ -1251,7 +1252,6 @@ dependencies = [ "proc_macro_srv", "profile", "project_model", - "ra_hir", "ra_ide", "ra_ide_db", "ra_ssr", -- cgit v1.2.3 From bb5c189b7dae1ea63ccd5d7a0c2e097d7c676f77 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:39:16 +0200 Subject: Rename ra_ide_db -> ide_db --- Cargo.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index ae71ea9fd..8704e4386 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -562,6 +562,25 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "ide_db" +version = "0.0.0" +dependencies = [ + "base_db", + "either", + "fst", + "hir", + "log", + "once_cell", + "profile", + "rayon", + "rustc-hash", + "stdx", + "syntax", + "test_utils", + "text_edit", +] + [[package]] name = "idna" version = "0.2.0" @@ -1090,9 +1109,9 @@ dependencies = [ "base_db", "either", "hir", + "ide_db", "itertools", "profile", - "ra_ide_db", "rustc-hash", "stdx", "syntax", @@ -1109,13 +1128,13 @@ dependencies = [ "either", "expect", "hir", + "ide_db", "indexmap", "itertools", "log", "oorandom", "profile", "ra_assists", - "ra_ide_db", "ra_ssr", "rustc-hash", "stdx", @@ -1124,25 +1143,6 @@ dependencies = [ "text_edit", ] -[[package]] -name = "ra_ide_db" -version = "0.1.0" -dependencies = [ - "base_db", - "either", - "fst", - "hir", - "log", - "once_cell", - "profile", - "rayon", - "rustc-hash", - "stdx", - "syntax", - "test_utils", - "text_edit", -] - [[package]] name = "ra_ssr" version = "0.1.0" @@ -1150,7 +1150,7 @@ dependencies = [ "base_db", "expect", "hir", - "ra_ide_db", + "ide_db", "rustc-hash", "syntax", "test_utils", @@ -1239,6 +1239,7 @@ dependencies = [ "hir", "hir_def", "hir_ty", + "ide_db", "itertools", "jod-thread", "log", @@ -1253,7 +1254,6 @@ dependencies = [ "profile", "project_model", "ra_ide", - "ra_ide_db", "ra_ssr", "rayon", "rustc-hash", -- cgit v1.2.3 From ae3abd6e575940eb1221acf26c09e96352f052fa Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:45:10 +0200 Subject: Rename ra_ssr -> ssr --- Cargo.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 8704e4386..4d8b74839 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1135,28 +1135,14 @@ dependencies = [ "oorandom", "profile", "ra_assists", - "ra_ssr", "rustc-hash", + "ssr", "stdx", "syntax", "test_utils", "text_edit", ] -[[package]] -name = "ra_ssr" -version = "0.1.0" -dependencies = [ - "base_db", - "expect", - "hir", - "ide_db", - "rustc-hash", - "syntax", - "test_utils", - "text_edit", -] - [[package]] name = "rayon" version = "1.3.1" @@ -1254,11 +1240,11 @@ dependencies = [ "profile", "project_model", "ra_ide", - "ra_ssr", "rayon", "rustc-hash", "serde", "serde_json", + "ssr", "stdx", "syntax", "test_utils", @@ -1456,6 +1442,20 @@ dependencies = [ "serde", ] +[[package]] +name = "ssr" +version = "0.1.0" +dependencies = [ + "base_db", + "expect", + "hir", + "ide_db", + "rustc-hash", + "syntax", + "test_utils", + "text_edit", +] + [[package]] name = "stdx" version = "0.1.0" -- cgit v1.2.3 From fc34403018079ea053f26d0a31b7517053c7dd8c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 17:33:38 +0200 Subject: Rename ra_assists -> assists --- Cargo.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 4d8b74839..621be0832 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -46,6 +46,23 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +[[package]] +name = "assists" +version = "0.0.0" +dependencies = [ + "base_db", + "either", + "hir", + "ide_db", + "itertools", + "profile", + "rustc-hash", + "stdx", + "syntax", + "test_utils", + "text_edit", +] + [[package]] name = "atty" version = "0.2.14" @@ -1102,27 +1119,11 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "ra_assists" -version = "0.1.0" -dependencies = [ - "base_db", - "either", - "hir", - "ide_db", - "itertools", - "profile", - "rustc-hash", - "stdx", - "syntax", - "test_utils", - "text_edit", -] - [[package]] name = "ra_ide" version = "0.1.0" dependencies = [ + "assists", "base_db", "cfg", "either", @@ -1134,7 +1135,6 @@ dependencies = [ "log", "oorandom", "profile", - "ra_assists", "rustc-hash", "ssr", "stdx", -- cgit v1.2.3 From 1b0c7701cc97cd7bef8bb9729011d4cf291a60c5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 17:42:52 +0200 Subject: Rename ra_ide -> ide --- Cargo.lock | 70 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 621be0832..2386c8f3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -346,7 +346,7 @@ dependencies = [ [[package]] name = "expect" -version = "0.1.0" +version = "0.0.0" dependencies = [ "difference", "once_cell", @@ -385,7 +385,7 @@ dependencies = [ [[package]] name = "flycheck" -version = "0.1.0" +version = "0.0.0" dependencies = [ "cargo_metadata", "crossbeam-channel", @@ -579,6 +579,30 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "ide" +version = "0.0.0" +dependencies = [ + "assists", + "base_db", + "cfg", + "either", + "expect", + "hir", + "ide_db", + "indexmap", + "itertools", + "log", + "oorandom", + "profile", + "rustc-hash", + "ssr", + "stdx", + "syntax", + "test_utils", + "text_edit", +] + [[package]] name = "ide_db" version = "0.0.0" @@ -992,7 +1016,7 @@ dependencies = [ [[package]] name = "paths" -version = "0.1.0" +version = "0.0.0" [[package]] name = "percent-encoding" @@ -1052,7 +1076,7 @@ dependencies = [ [[package]] name = "proc_macro_api" -version = "0.1.0" +version = "0.0.0" dependencies = [ "crossbeam-channel", "jod-thread", @@ -1119,30 +1143,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "ra_ide" -version = "0.1.0" -dependencies = [ - "assists", - "base_db", - "cfg", - "either", - "expect", - "hir", - "ide_db", - "indexmap", - "itertools", - "log", - "oorandom", - "profile", - "rustc-hash", - "ssr", - "stdx", - "syntax", - "test_utils", - "text_edit", -] - [[package]] name = "rayon" version = "1.3.1" @@ -1213,7 +1213,7 @@ dependencies = [ [[package]] name = "rust-analyzer" -version = "0.1.0" +version = "0.0.0" dependencies = [ "anyhow", "base_db", @@ -1225,6 +1225,7 @@ dependencies = [ "hir", "hir_def", "hir_ty", + "ide", "ide_db", "itertools", "jod-thread", @@ -1239,7 +1240,6 @@ dependencies = [ "proc_macro_srv", "profile", "project_model", - "ra_ide", "rayon", "rustc-hash", "serde", @@ -1444,7 +1444,7 @@ dependencies = [ [[package]] name = "ssr" -version = "0.1.0" +version = "0.0.0" dependencies = [ "base_db", "expect", @@ -1458,7 +1458,7 @@ dependencies = [ [[package]] name = "stdx" -version = "0.1.0" +version = "0.0.0" [[package]] name = "syn" @@ -1515,7 +1515,7 @@ dependencies = [ [[package]] name = "test_utils" -version = "0.1.0" +version = "0.0.0" dependencies = [ "difference", "rustc-hash", @@ -1729,7 +1729,7 @@ dependencies = [ [[package]] name = "vfs" -version = "0.1.0" +version = "0.0.0" dependencies = [ "fst", "paths", @@ -1738,7 +1738,7 @@ dependencies = [ [[package]] name = "vfs-notify" -version = "0.1.0" +version = "0.0.0" dependencies = [ "crossbeam-channel", "jod-thread", -- cgit v1.2.3 From cb816b1ea87b24f34eeecfdd98aeeb629915d661 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Sat, 15 Aug 2020 00:19:47 +0200 Subject: Add a proc_macro_test crate This exports all 3 kinds of proc macros and is useful for testing --- Cargo.lock | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 2386c8f3a..c7809a65a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1097,12 +1097,17 @@ dependencies = [ "mbe", "memmap", "proc_macro_api", + "proc_macro_test", "serde_derive", "test_utils", "toolchain", "tt", ] +[[package]] +name = "proc_macro_test" +version = "0.0.0" + [[package]] name = "profile" version = "0.0.0" -- cgit v1.2.3 From 9aca8d664738716cd07e9c9b0fe3d9d808342f26 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Sun, 16 Aug 2020 11:34:13 -0400 Subject: Update chrono --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index c7809a65a..40ae42f87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,9 +214,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.13" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" +checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b" dependencies = [ "num-integer", "num-traits", -- cgit v1.2.3 From 7819e794db1c3c0e9e930e9b403f929bdb809be5 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Sun, 16 Aug 2020 11:57:10 -0400 Subject: Bump rustc_lexer --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 40ae42f87..15cc26180 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1264,9 +1264,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_lexer" -version = "671.0.0" +version = "673.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1221f3bfa2943c942cf8da319ab2346887f8757778c29c7f1822cd27b521f" +checksum = "f6b71fa1285bdefe5fb61e59b63d6cc246abf337f4acafdd620d721bc488e671" dependencies = [ "unicode-xid", ] -- cgit v1.2.3 From 409090e74cd76de35d5ae5ddd7a1e353a9c161f6 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Sun, 16 Aug 2020 12:15:44 -0400 Subject: Chalk 0.23 --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 15cc26180..24dea133d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -162,9 +162,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "chalk-derive" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1df0dbb57d74b4acd20f20fa66ab2acd09776b79eaeb9d8f947b2f3e01c40bf" +checksum = "c3cb438e961fd7f1183dc5e0bdcfd09253bf9b90592cf665d1ce6787d8a4908f" dependencies = [ "proc-macro2", "quote", @@ -174,9 +174,9 @@ dependencies = [ [[package]] name = "chalk-ir" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44361a25dbdb1dc428f56ad7a3c21ba9ca12f3225c26a47919ff6fcb10a583d4" +checksum = "bb332abfcb015b148c6fbab39b1d13282745b0f7f312019dd8e138f5f3f0855d" dependencies = [ "chalk-derive", "lazy_static", @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "chalk-recursive" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd89556b98de156d5eaf21077d297cd2198628f10f2df140798ea3a5dd84bc86" +checksum = "e7c7673f10c5fa1acf7fa07d4f4c5917cbcf161ed3a952d14530c79950de32d2" dependencies = [ "chalk-derive", "chalk-ir", @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "chalk-solve" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a886da37a0dc457057d86f78f026f7a09c6d8088aa13f4f4127fdb8dc80119a3" +checksum = "802de4eff72e5a5d2828e6c07224c74d66949dc6308aff025d0ae2871a11b4eb" dependencies = [ "chalk-derive", "chalk-ir", -- cgit v1.2.3 From 88adca766aca7c8e771b422c33f44afbfc6d0d81 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 18 Aug 2020 10:49:18 +0200 Subject: :arrow_up: crates --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 24dea133d..7abfeaaeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -765,9 +765,9 @@ dependencies = [ [[package]] name = "lsp-server" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b4ace8ebe5d2aff3687ce0ed507f6020d6a47a7de2b0d3d664ea237ffb0c62" +checksum = "87fce8851309a325974ec76efe7c9d954d152c9ff4fded6520eb3c96d0aa3a96" dependencies = [ "crossbeam-channel", "log", @@ -971,9 +971,9 @@ checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" [[package]] name = "once_cell" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" [[package]] name = "oorandom" @@ -1036,9 +1036,9 @@ dependencies = [ [[package]] name = "perf-event-open-sys" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e7183862f36d10263d0a1ccaef50fef734ade948bf026afd1bd97355c78273" +checksum = "d9ebe2b9ef0cb884ef778c5a533144e348e9839a9fcf67f3d24e1890ac9088d6" dependencies = [ "libc", ] @@ -1578,9 +1578,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" [[package]] name = "toolchain" -- cgit v1.2.3 From 29e6238cb7330f7d29f33ff03a4ccc0a0cec9f4d Mon Sep 17 00:00:00 2001 From: David Lattimore Date: Tue, 18 Aug 2020 20:39:55 +1000 Subject: SSR: A few small refactorings --- Cargo.lock | 1 + 1 file changed, 1 insertion(+) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 2386c8f3a..c1f1c07a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1450,6 +1450,7 @@ dependencies = [ "expect", "hir", "ide_db", + "itertools", "rustc-hash", "syntax", "test_utils", -- cgit v1.2.3 From 6b0b9178b37edb6ca61da7d15049ccb707e3c2ff Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 18 Aug 2020 23:52:29 +0200 Subject: :arrow_up: crates --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index ffa385106..5e0dc061f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1026,9 +1026,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "perf-event" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c42ba5d85a2f4472b99f475fb60cf336d9b4c85b1ea8bb300fef2e3c7c8f89" +checksum = "273069d0b956939ba75e8b5663328b9b7f0dc2e262b3306c6be66c4d87e2240a" dependencies = [ "libc", "perf-event-open-sys", @@ -1036,9 +1036,9 @@ dependencies = [ [[package]] name = "perf-event-open-sys" -version = "0.3.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ebe2b9ef0cb884ef778c5a533144e348e9839a9fcf67f3d24e1890ac9088d6" +checksum = "66f37842e29d92d05872a3c0271ba6717842695ecb896cb2e147a825c804b207" dependencies = [ "libc", ] @@ -1603,9 +1603,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe233f4227389ab7df5b32649239da7ebe0b281824b4e84b342d04d3fd8c25e" +checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" dependencies = [ "proc-macro2", "quote", -- cgit v1.2.3 From 41c5d9caaab879740ae06f02f4868a82ed3fa217 Mon Sep 17 00:00:00 2001 From: kjeremy Date: Thu, 20 Aug 2020 12:50:43 -0400 Subject: Update crates --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 5e0dc061f..bc9a989fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" [[package]] name = "cfg" @@ -373,9 +373,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" +checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" dependencies = [ "cfg-if", "crc32fast", @@ -723,9 +723,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" +checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" [[package]] name = "libloading" @@ -738,9 +738,9 @@ dependencies = [ [[package]] name = "libmimalloc-sys" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27252ec1d0c4e0dd6142cbc572da50b363ab56fc334f7aa8fadf295b2e24e74" +checksum = "677c4be79b14bd72496b87789b702ba02cd1a9f16a59369fe847082fd03efd88" dependencies = [ "cmake", ] @@ -844,9 +844,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c52de2069999f01bd26436564dbe7de3a87898feeb7a0d0ff9eb20a05bb7ca0" +checksum = "00759bcf69082fa629ae8823fcc72f7454a90c6476110297a1ae5fb3a559e474" dependencies = [ "libmimalloc-sys", ] -- cgit v1.2.3 From b0fd3faf36c94c3fc52151c6aa82b36b43b7cceb Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 21 Aug 2020 13:19:31 +0200 Subject: Switch to expect_test from crates.io --- Cargo.lock | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 5e0dc061f..559154a8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -345,12 +345,13 @@ dependencies = [ ] [[package]] -name = "expect" -version = "0.0.0" +name = "expect-test" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e383741ea1982866572109d1a8c807bd36aad91fca701489fdca56ef92b3b8" dependencies = [ "difference", "once_cell", - "stdx", ] [[package]] @@ -508,7 +509,7 @@ dependencies = [ "cfg", "drop_bomb", "either", - "expect", + "expect-test", "fst", "hir_expand", "indexmap", @@ -553,7 +554,7 @@ dependencies = [ "chalk-recursive", "chalk-solve", "ena", - "expect", + "expect-test", "hir_def", "hir_expand", "itertools", @@ -587,7 +588,7 @@ dependencies = [ "base_db", "cfg", "either", - "expect", + "expect-test", "hir", "ide_db", "indexmap", @@ -1225,7 +1226,7 @@ dependencies = [ "cfg", "crossbeam-channel", "env_logger", - "expect", + "expect-test", "flycheck", "hir", "hir_def", @@ -1452,7 +1453,7 @@ name = "ssr" version = "0.0.0" dependencies = [ "base_db", - "expect", + "expect-test", "hir", "ide_db", "itertools", @@ -1494,7 +1495,7 @@ name = "syntax" version = "0.0.0" dependencies = [ "arrayvec", - "expect", + "expect-test", "itertools", "once_cell", "parser", -- cgit v1.2.3 From 863b1fb731e797f02daeac87a94d40a34222a062 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 21 Aug 2020 19:12:38 +0200 Subject: :arrow_up: ungrammar --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index ad7760d98..f39da8105 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1688,9 +1688,9 @@ dependencies = [ [[package]] name = "ungrammar" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e20e58a08ee1bcf8a4695cf74550cf054d6c489105f594beacb2c684210aad" +checksum = "bab6142ac77be714b1ea78faca6efaed5478c50724786b0fe80d8528d10692b3" [[package]] name = "unicode-bidi" -- cgit v1.2.3 From 95f33bb5f73a7f9b7922eef14b996c0a489a6404 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 21 Aug 2020 19:14:44 +0200 Subject: :arrow_up: autocfg --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index f39da8105..46d9469c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -- cgit v1.2.3