diff options
Diffstat (limited to 'crates/hir_def')
-rw-r--r-- | crates/hir_def/Cargo.toml | 23 | ||||
-rw-r--r-- | crates/hir_def/src/body/lower.rs | 2 | ||||
-rw-r--r-- | crates/hir_def/src/import_map.rs | 2 | ||||
-rw-r--r-- | crates/hir_def/src/item_tree/tests.rs | 2 | ||||
-rw-r--r-- | crates/hir_def/src/nameres/tests.rs | 2 |
5 files changed, 16 insertions, 15 deletions
diff --git a/crates/hir_def/Cargo.toml b/crates/hir_def/Cargo.toml index 403bc2aff..011e4612c 100644 --- a/crates/hir_def/Cargo.toml +++ b/crates/hir_def/Cargo.toml | |||
@@ -1,6 +1,7 @@ | |||
1 | [package] | 1 | [package] |
2 | name = "hir_def" | 2 | name = "hir_def" |
3 | version = "0.0.0" | 3 | version = "0.0.0" |
4 | description = "TBD" | ||
4 | license = "MIT OR Apache-2.0" | 5 | license = "MIT OR Apache-2.0" |
5 | authors = ["rust-analyzer developers"] | 6 | authors = ["rust-analyzer developers"] |
6 | edition = "2018" | 7 | edition = "2018" |
@@ -20,16 +21,16 @@ itertools = "0.9.0" | |||
20 | indexmap = "1.4.0" | 21 | indexmap = "1.4.0" |
21 | smallvec = "1.4.0" | 22 | smallvec = "1.4.0" |
22 | 23 | ||
23 | stdx = { path = "../stdx" } | 24 | stdx = { path = "../stdx", version = "0.0.0" } |
24 | arena = { path = "../arena" } | 25 | arena = { path = "../arena", version = "0.0.0" } |
25 | base_db = { path = "../base_db" } | 26 | base_db = { path = "../base_db", version = "0.0.0" } |
26 | syntax = { path = "../syntax" } | 27 | syntax = { path = "../syntax", version = "0.0.0" } |
27 | profile = { path = "../profile" } | 28 | profile = { path = "../profile", version = "0.0.0" } |
28 | hir_expand = { path = "../hir_expand" } | 29 | hir_expand = { path = "../hir_expand", version = "0.0.0" } |
29 | test_utils = { path = "../test_utils" } | 30 | test_utils = { path = "../test_utils", version = "0.0.0" } |
30 | mbe = { path = "../mbe" } | 31 | mbe = { path = "../mbe", version = "0.0.0" } |
31 | cfg = { path = "../cfg" } | 32 | cfg = { path = "../cfg", version = "0.0.0" } |
32 | tt = { path = "../tt" } | 33 | tt = { path = "../tt", version = "0.0.0" } |
33 | 34 | ||
34 | [dev-dependencies] | 35 | [dev-dependencies] |
35 | expect = { path = "../expect" } | 36 | expect-test = "0.1" |
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs index a26251cde..30ac12a12 100644 --- a/crates/hir_def/src/body/lower.rs +++ b/crates/hir_def/src/body/lower.rs | |||
@@ -329,7 +329,7 @@ impl ExprCollector<'_> { | |||
329 | self.alloc_expr(Expr::Call { callee, args }, syntax_ptr) | 329 | self.alloc_expr(Expr::Call { callee, args }, syntax_ptr) |
330 | } | 330 | } |
331 | ast::Expr::MethodCallExpr(e) => { | 331 | ast::Expr::MethodCallExpr(e) => { |
332 | let receiver = self.collect_expr_opt(e.expr()); | 332 | let receiver = self.collect_expr_opt(e.receiver()); |
333 | let args = if let Some(arg_list) = e.arg_list() { | 333 | let args = if let Some(arg_list) = e.arg_list() { |
334 | arg_list.args().map(|e| self.collect_expr(e)).collect() | 334 | arg_list.args().map(|e| self.collect_expr(e)).collect() |
335 | } else { | 335 | } else { |
diff --git a/crates/hir_def/src/import_map.rs b/crates/hir_def/src/import_map.rs index d32a0bdaf..a442fb63a 100644 --- a/crates/hir_def/src/import_map.rs +++ b/crates/hir_def/src/import_map.rs | |||
@@ -328,7 +328,7 @@ pub fn search_dependencies<'a>( | |||
328 | #[cfg(test)] | 328 | #[cfg(test)] |
329 | mod tests { | 329 | mod tests { |
330 | use base_db::{fixture::WithFixture, SourceDatabase, Upcast}; | 330 | use base_db::{fixture::WithFixture, SourceDatabase, Upcast}; |
331 | use expect::{expect, Expect}; | 331 | use expect_test::{expect, Expect}; |
332 | 332 | ||
333 | use crate::{test_db::TestDB, AssocContainerId, Lookup}; | 333 | use crate::{test_db::TestDB, AssocContainerId, Lookup}; |
334 | 334 | ||
diff --git a/crates/hir_def/src/item_tree/tests.rs b/crates/hir_def/src/item_tree/tests.rs index 9c5bf72bd..620e697d4 100644 --- a/crates/hir_def/src/item_tree/tests.rs +++ b/crates/hir_def/src/item_tree/tests.rs | |||
@@ -1,5 +1,5 @@ | |||
1 | use base_db::fixture::WithFixture; | 1 | use base_db::fixture::WithFixture; |
2 | use expect::{expect, Expect}; | 2 | use expect_test::{expect, Expect}; |
3 | use hir_expand::{db::AstDatabase, HirFileId, InFile}; | 3 | use hir_expand::{db::AstDatabase, HirFileId, InFile}; |
4 | use rustc_hash::FxHashSet; | 4 | use rustc_hash::FxHashSet; |
5 | use std::sync::Arc; | 5 | use std::sync::Arc; |
diff --git a/crates/hir_def/src/nameres/tests.rs b/crates/hir_def/src/nameres/tests.rs index b105d56b2..8aaf7a158 100644 --- a/crates/hir_def/src/nameres/tests.rs +++ b/crates/hir_def/src/nameres/tests.rs | |||
@@ -7,7 +7,7 @@ mod primitives; | |||
7 | use std::sync::Arc; | 7 | use std::sync::Arc; |
8 | 8 | ||
9 | use base_db::{fixture::WithFixture, SourceDatabase}; | 9 | use base_db::{fixture::WithFixture, SourceDatabase}; |
10 | use expect::{expect, Expect}; | 10 | use expect_test::{expect, Expect}; |
11 | use test_utils::mark; | 11 | use test_utils::mark; |
12 | 12 | ||
13 | use crate::{db::DefDatabase, nameres::*, test_db::TestDB}; | 13 | use crate::{db::DefDatabase, nameres::*, test_db::TestDB}; |