diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-03 22:29:30 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-03 22:29:30 +0000 |
commit | 5c35539f0f69472546253d415c30f524d0a1a212 (patch) | |
tree | fb385c03f3fdd627e9a8a97b329fac347c818e84 /crates/ra_hir_def | |
parent | e811be0fdca02b8aafc5da0109c655030232b4af (diff) | |
parent | 3603d0213480c7b3423345d21243397eb904a073 (diff) |
Merge #2171
2171: Reexport relative_path from ra_db r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def')
-rw-r--r-- | crates/ra_hir_def/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/diagnostics.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 2 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres/mod_resolution.rs | 3 | ||||
-rw-r--r-- | crates/ra_hir_def/src/test_db.rs | 3 |
5 files changed, 4 insertions, 8 deletions
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml index 15055db64..21262be79 100644 --- a/crates/ra_hir_def/Cargo.toml +++ b/crates/ra_hir_def/Cargo.toml | |||
@@ -7,7 +7,6 @@ authors = ["rust-analyzer developers"] | |||
7 | [dependencies] | 7 | [dependencies] |
8 | log = "0.4.5" | 8 | log = "0.4.5" |
9 | once_cell = "1.0.1" | 9 | once_cell = "1.0.1" |
10 | relative-path = "1.0.0" | ||
11 | rustc-hash = "1.0" | 10 | rustc-hash = "1.0" |
12 | 11 | ||
13 | ra_arena = { path = "../ra_arena" } | 12 | ra_arena = { path = "../ra_arena" } |
@@ -22,4 +21,3 @@ tt = { path = "../ra_tt", package = "ra_tt" } | |||
22 | 21 | ||
23 | [dev-dependencies] | 22 | [dev-dependencies] |
24 | insta = "0.12.0" | 23 | insta = "0.12.0" |
25 | |||
diff --git a/crates/ra_hir_def/src/diagnostics.rs b/crates/ra_hir_def/src/diagnostics.rs index 1c1ccdecb..9843009a5 100644 --- a/crates/ra_hir_def/src/diagnostics.rs +++ b/crates/ra_hir_def/src/diagnostics.rs | |||
@@ -3,8 +3,8 @@ | |||
3 | use std::any::Any; | 3 | use std::any::Any; |
4 | 4 | ||
5 | use hir_expand::diagnostics::Diagnostic; | 5 | use hir_expand::diagnostics::Diagnostic; |
6 | use ra_db::RelativePathBuf; | ||
6 | use ra_syntax::{ast, AstPtr, SyntaxNodePtr}; | 7 | use ra_syntax::{ast, AstPtr, SyntaxNodePtr}; |
7 | use relative_path::RelativePathBuf; | ||
8 | 8 | ||
9 | use hir_expand::{HirFileId, Source}; | 9 | use hir_expand::{HirFileId, Source}; |
10 | 10 | ||
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index fbd4248e6..433bdde48 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs | |||
@@ -504,8 +504,8 @@ impl CrateDefMap { | |||
504 | 504 | ||
505 | mod diagnostics { | 505 | mod diagnostics { |
506 | use hir_expand::diagnostics::DiagnosticSink; | 506 | use hir_expand::diagnostics::DiagnosticSink; |
507 | use ra_db::RelativePathBuf; | ||
507 | use ra_syntax::{ast, AstPtr}; | 508 | use ra_syntax::{ast, AstPtr}; |
508 | use relative_path::RelativePathBuf; | ||
509 | 509 | ||
510 | use crate::{db::DefDatabase2, diagnostics::UnresolvedModule, nameres::CrateModuleId, AstId}; | 510 | use crate::{db::DefDatabase2, diagnostics::UnresolvedModule, nameres::CrateModuleId, AstId}; |
511 | 511 | ||
diff --git a/crates/ra_hir_def/src/nameres/mod_resolution.rs b/crates/ra_hir_def/src/nameres/mod_resolution.rs index 7d7e2779a..f6b0b8fb1 100644 --- a/crates/ra_hir_def/src/nameres/mod_resolution.rs +++ b/crates/ra_hir_def/src/nameres/mod_resolution.rs | |||
@@ -1,8 +1,7 @@ | |||
1 | //! This module resolves `mod foo;` declaration to file. | 1 | //! This module resolves `mod foo;` declaration to file. |
2 | use hir_expand::name::Name; | 2 | use hir_expand::name::Name; |
3 | use ra_db::FileId; | 3 | use ra_db::{FileId, RelativePathBuf}; |
4 | use ra_syntax::SmolStr; | 4 | use ra_syntax::SmolStr; |
5 | use relative_path::RelativePathBuf; | ||
6 | 5 | ||
7 | use crate::{db::DefDatabase2, HirFileId}; | 6 | use crate::{db::DefDatabase2, HirFileId}; |
8 | 7 | ||
diff --git a/crates/ra_hir_def/src/test_db.rs b/crates/ra_hir_def/src/test_db.rs index f91a5b41d..8ee8e40d0 100644 --- a/crates/ra_hir_def/src/test_db.rs +++ b/crates/ra_hir_def/src/test_db.rs | |||
@@ -5,8 +5,7 @@ use std::{ | |||
5 | sync::{Arc, Mutex}, | 5 | sync::{Arc, Mutex}, |
6 | }; | 6 | }; |
7 | 7 | ||
8 | use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate}; | 8 | use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, RelativePath}; |
9 | use relative_path::RelativePath; | ||
10 | 9 | ||
11 | #[salsa::database( | 10 | #[salsa::database( |
12 | ra_db::SourceDatabaseExtStorage, | 11 | ra_db::SourceDatabaseExtStorage, |