aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-11-03 22:29:30 +0000
committerGitHub <[email protected]>2019-11-03 22:29:30 +0000
commit5c35539f0f69472546253d415c30f524d0a1a212 (patch)
treefb385c03f3fdd627e9a8a97b329fac347c818e84 /crates/ra_hir
parente811be0fdca02b8aafc5da0109c655030232b4af (diff)
parent3603d0213480c7b3423345d21243397eb904a073 (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')
-rw-r--r--crates/ra_hir/Cargo.toml1
-rw-r--r--crates/ra_hir/src/mock.rs3
2 files changed, 1 insertions, 3 deletions
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index fae5dc7cb..324961328 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -7,7 +7,6 @@ authors = ["rust-analyzer developers"]
7[dependencies] 7[dependencies]
8arrayvec = "0.5.1" 8arrayvec = "0.5.1"
9log = "0.4.5" 9log = "0.4.5"
10relative-path = "1.0.0"
11rustc-hash = "1.0" 10rustc-hash = "1.0"
12parking_lot = "0.9.0" 11parking_lot = "0.9.0"
13ena = "0.13" 12ena = "0.13"
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index 4c89c8d38..8d98f88ce 100644
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -7,9 +7,8 @@ use parking_lot::Mutex;
7use ra_cfg::CfgOptions; 7use ra_cfg::CfgOptions;
8use ra_db::{ 8use ra_db::{
9 salsa, CrateGraph, CrateId, Edition, FileId, FileLoader, FileLoaderDelegate, FilePosition, 9 salsa, CrateGraph, CrateId, Edition, FileId, FileLoader, FileLoaderDelegate, FilePosition,
10 SourceDatabase, SourceDatabaseExt, SourceRoot, SourceRootId, 10 RelativePath, RelativePathBuf, SourceDatabase, SourceDatabaseExt, SourceRoot, SourceRootId,
11}; 11};
12use relative_path::{RelativePath, RelativePathBuf};
13use rustc_hash::FxHashMap; 12use rustc_hash::FxHashMap;
14use test_utils::{extract_offset, parse_fixture, CURSOR_MARKER}; 13use test_utils::{extract_offset, parse_fixture, CURSOR_MARKER};
15 14