diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_batch/Cargo.toml | 4 | ||||
-rw-r--r-- | crates/ra_cli/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ra_db/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir/src/ty/method_resolution.rs | 10 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 1 | ||||
-rw-r--r-- | crates/ra_project_model/Cargo.toml | 5 | ||||
-rw-r--r-- | crates/ra_syntax/Cargo.toml | 3 | ||||
-rw-r--r-- | crates/test_utils/Cargo.toml | 1 |
9 files changed, 6 insertions, 23 deletions
diff --git a/crates/ra_batch/Cargo.toml b/crates/ra_batch/Cargo.toml index 7d8837fc3..0ee94c445 100644 --- a/crates/ra_batch/Cargo.toml +++ b/crates/ra_batch/Cargo.toml | |||
@@ -9,11 +9,7 @@ log = "0.4.5" | |||
9 | rustc-hash = "1.0" | 9 | rustc-hash = "1.0" |
10 | 10 | ||
11 | ra_vfs = "0.2.0" | 11 | ra_vfs = "0.2.0" |
12 | ra_syntax = { path = "../ra_syntax" } | ||
13 | ra_db = { path = "../ra_db" } | 12 | ra_db = { path = "../ra_db" } |
14 | ra_ide_api = { path = "../ra_ide_api" } | 13 | ra_ide_api = { path = "../ra_ide_api" } |
15 | ra_hir = { path = "../ra_hir" } | 14 | ra_hir = { path = "../ra_hir" } |
16 | ra_project_model = { path = "../ra_project_model" } | 15 | ra_project_model = { path = "../ra_project_model" } |
17 | |||
18 | [dev-dependencies] | ||
19 | test_utils = { path = "../test_utils" } | ||
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml index 639b7c949..4d9c41ae9 100644 --- a/crates/ra_cli/Cargo.toml +++ b/crates/ra_cli/Cargo.toml | |||
@@ -7,7 +7,6 @@ publish = false | |||
7 | 7 | ||
8 | [dependencies] | 8 | [dependencies] |
9 | clap = "2.32.0" | 9 | clap = "2.32.0" |
10 | join_to_string = "0.1.1" | ||
11 | flexi_logger = "0.13.0" | 10 | flexi_logger = "0.13.0" |
12 | indicatif = "0.11.0" | 11 | indicatif = "0.11.0" |
13 | 12 | ||
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index f73dd739a..7a13c247b 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml | |||
@@ -9,7 +9,5 @@ salsa = "0.12.3" | |||
9 | relative-path = "0.4.0" | 9 | relative-path = "0.4.0" |
10 | rustc-hash = "1.0" | 10 | rustc-hash = "1.0" |
11 | 11 | ||
12 | ra_arena = { path = "../ra_arena" } | ||
13 | ra_syntax = { path = "../ra_syntax" } | 12 | ra_syntax = { path = "../ra_syntax" } |
14 | ra_prof = { path = "../ra_prof" } | 13 | ra_prof = { path = "../ra_prof" } |
15 | test_utils = { path = "../test_utils" } | ||
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index e44e144d6..de2c2dbec 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml | |||
@@ -11,7 +11,6 @@ relative-path = "0.4.0" | |||
11 | rustc-hash = "1.0" | 11 | rustc-hash = "1.0" |
12 | parking_lot = "0.8.0" | 12 | parking_lot = "0.8.0" |
13 | ena = "0.13" | 13 | ena = "0.13" |
14 | join_to_string = "0.1.3" | ||
15 | once_cell = "0.2" | 14 | once_cell = "0.2" |
16 | 15 | ||
17 | ra_syntax = { path = "../ra_syntax" } | 16 | ra_syntax = { path = "../ra_syntax" } |
@@ -28,5 +27,4 @@ chalk-ir = { git = "https://github.com/flodiebold/chalk.git", branch = "fuel" } | |||
28 | lalrpop-intern = "0.15.1" | 27 | lalrpop-intern = "0.15.1" |
29 | 28 | ||
30 | [dev-dependencies] | 29 | [dev-dependencies] |
31 | flexi_logger = "0.13.0" | ||
32 | insta = "0.8.1" | 30 | insta = "0.8.1" |
diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs index 76ace66ea..f65ad08a8 100644 --- a/crates/ra_hir/src/ty/method_resolution.rs +++ b/crates/ra_hir/src/ty/method_resolution.rs | |||
@@ -14,7 +14,7 @@ use crate::{ | |||
14 | nameres::CrateModuleId, | 14 | nameres::CrateModuleId, |
15 | resolve::Resolver, | 15 | resolve::Resolver, |
16 | traits::TraitItem, | 16 | traits::TraitItem, |
17 | ty::primitive::{UncertainFloatTy, UncertainIntTy}, | 17 | ty::primitive::{FloatBitness, UncertainFloatTy, UncertainIntTy}, |
18 | ty::{Ty, TypeCtor}, | 18 | ty::{Ty, TypeCtor}, |
19 | Crate, Function, HirDatabase, Module, Name, Trait, | 19 | Crate, Function, HirDatabase, Module, Name, Trait, |
20 | }; | 20 | }; |
@@ -132,9 +132,11 @@ fn def_crates(db: &impl HirDatabase, cur_crate: Crate, ty: &Ty) -> Option<ArrayV | |||
132 | TypeCtor::Adt(def_id) => Some(std::iter::once(def_id.krate(db)?).collect()), | 132 | TypeCtor::Adt(def_id) => Some(std::iter::once(def_id.krate(db)?).collect()), |
133 | TypeCtor::Bool => lang_item_crate!(db, cur_crate, "bool"), | 133 | TypeCtor::Bool => lang_item_crate!(db, cur_crate, "bool"), |
134 | TypeCtor::Char => lang_item_crate!(db, cur_crate, "char"), | 134 | TypeCtor::Char => lang_item_crate!(db, cur_crate, "char"), |
135 | TypeCtor::Float(UncertainFloatTy::Known(f)) => { | 135 | TypeCtor::Float(UncertainFloatTy::Known(f)) => match f.bitness { |
136 | lang_item_crate!(db, cur_crate, f.ty_to_string()) | 136 | // There are two lang items: one in libcore (fXX) and one in libstd (fXX_runtime) |
137 | } | 137 | FloatBitness::X32 => lang_item_crate!(db, cur_crate, "f32", "f32_runtime"), |
138 | FloatBitness::X64 => lang_item_crate!(db, cur_crate, "f64", "f64_runtime"), | ||
139 | }, | ||
138 | TypeCtor::Int(UncertainIntTy::Known(i)) => { | 140 | TypeCtor::Int(UncertainIntTy::Known(i)) => { |
139 | lang_item_crate!(db, cur_crate, i.ty_to_string()) | 141 | lang_item_crate!(db, cur_crate, i.ty_to_string()) |
140 | } | 142 | } |
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 50bc8111b..753710931 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -22,7 +22,6 @@ thread_worker = { path = "../thread_worker" } | |||
22 | ra_syntax = { path = "../ra_syntax" } | 22 | ra_syntax = { path = "../ra_syntax" } |
23 | ra_text_edit = { path = "../ra_text_edit" } | 23 | ra_text_edit = { path = "../ra_text_edit" } |
24 | ra_ide_api = { path = "../ra_ide_api" } | 24 | ra_ide_api = { path = "../ra_ide_api" } |
25 | ra_arena = { path = "../ra_arena" } | ||
26 | gen_lsp_server = { path = "../gen_lsp_server" } | 25 | gen_lsp_server = { path = "../gen_lsp_server" } |
27 | ra_project_model = { path = "../ra_project_model" } | 26 | ra_project_model = { path = "../ra_project_model" } |
28 | ra_prof = { path = "../ra_prof" } | 27 | ra_prof = { path = "../ra_prof" } |
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml index a1f7bf6dc..3545d23c9 100644 --- a/crates/ra_project_model/Cargo.toml +++ b/crates/ra_project_model/Cargo.toml | |||
@@ -9,8 +9,6 @@ log = "0.4.5" | |||
9 | rustc-hash = "1.0" | 9 | rustc-hash = "1.0" |
10 | relative-path = "0.4.0" | 10 | relative-path = "0.4.0" |
11 | 11 | ||
12 | walkdir = "2.2.7" | ||
13 | |||
14 | cargo_metadata = "0.8.0" | 12 | cargo_metadata = "0.8.0" |
15 | 13 | ||
16 | ra_arena = { path = "../ra_arena" } | 14 | ra_arena = { path = "../ra_arena" } |
@@ -18,6 +16,3 @@ ra_db = { path = "../ra_db" } | |||
18 | 16 | ||
19 | serde = { version = "1.0.89", features = ["derive"] } | 17 | serde = { version = "1.0.89", features = ["derive"] } |
20 | serde_json = "1.0.39" | 18 | serde_json = "1.0.39" |
21 | |||
22 | [dev-dependencies] | ||
23 | test_utils = { path = "../test_utils" } | ||
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml index 156991358..37a91ea35 100644 --- a/crates/ra_syntax/Cargo.toml +++ b/crates/ra_syntax/Cargo.toml | |||
@@ -8,15 +8,12 @@ description = "Comment and whitespace preserving parser for the Rust langauge" | |||
8 | repository = "https://github.com/rust-analyzer/rust-analyzer" | 8 | repository = "https://github.com/rust-analyzer/rust-analyzer" |
9 | 9 | ||
10 | [dependencies] | 10 | [dependencies] |
11 | arrayvec = "0.4.10" | ||
12 | unicode-xid = "0.1.0" | 11 | unicode-xid = "0.1.0" |
13 | itertools = "0.8.0" | 12 | itertools = "0.8.0" |
14 | drop_bomb = "0.1.4" | ||
15 | rowan = "0.5.0" | 13 | rowan = "0.5.0" |
16 | 14 | ||
17 | # ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here | 15 | # ideally, `serde` should be enabled by `ra_lsp_server`, but we enable it here |
18 | # to reduce number of compilations | 16 | # to reduce number of compilations |
19 | text_unit = { version = "0.1.8", features = ["serde"] } | ||
20 | smol_str = { version = "0.1.12", features = ["serde"] } | 17 | smol_str = { version = "0.1.12", features = ["serde"] } |
21 | 18 | ||
22 | ra_text_edit = { path = "../ra_text_edit" } | 19 | ra_text_edit = { path = "../ra_text_edit" } |
diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml index b58dbd1cf..0be9c3665 100644 --- a/crates/test_utils/Cargo.toml +++ b/crates/test_utils/Cargo.toml | |||
@@ -6,6 +6,5 @@ authors = ["rust-analyzer developers"] | |||
6 | 6 | ||
7 | [dependencies] | 7 | [dependencies] |
8 | difference = "2.0.0" | 8 | difference = "2.0.0" |
9 | itertools = "0.8.0" | ||
10 | text_unit = "0.1.2" | 9 | text_unit = "0.1.2" |
11 | serde_json = "1.0.34" | 10 | serde_json = "1.0.34" |