From 3603d0213480c7b3423345d21243397eb904a073 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 4 Nov 2019 01:14:17 +0300
Subject: Reexport relative_path from ra_db

---
 crates/ra_hir_def/src/diagnostics.rs            | 2 +-
 crates/ra_hir_def/src/nameres.rs                | 2 +-
 crates/ra_hir_def/src/nameres/mod_resolution.rs | 3 +--
 crates/ra_hir_def/src/test_db.rs                | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'crates/ra_hir_def/src')

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 @@
 use std::any::Any;
 
 use hir_expand::diagnostics::Diagnostic;
+use ra_db::RelativePathBuf;
 use ra_syntax::{ast, AstPtr, SyntaxNodePtr};
-use relative_path::RelativePathBuf;
 
 use hir_expand::{HirFileId, Source};
 
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 {
 
 mod diagnostics {
     use hir_expand::diagnostics::DiagnosticSink;
+    use ra_db::RelativePathBuf;
     use ra_syntax::{ast, AstPtr};
-    use relative_path::RelativePathBuf;
 
     use crate::{db::DefDatabase2, diagnostics::UnresolvedModule, nameres::CrateModuleId, AstId};
 
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 @@
 //! This module resolves `mod foo;` declaration to file.
 use hir_expand::name::Name;
-use ra_db::FileId;
+use ra_db::{FileId, RelativePathBuf};
 use ra_syntax::SmolStr;
-use relative_path::RelativePathBuf;
 
 use crate::{db::DefDatabase2, HirFileId};
 
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::{
     sync::{Arc, Mutex},
 };
 
-use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate};
-use relative_path::RelativePath;
+use ra_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, RelativePath};
 
 #[salsa::database(
     ra_db::SourceDatabaseExtStorage,
-- 
cgit v1.2.3