diff options
author | kjeremy <[email protected]> | 2019-10-15 15:44:26 +0100 |
---|---|---|
committer | kjeremy <[email protected]> | 2019-10-17 18:08:33 +0100 |
commit | c3045c68a95d34d9381dc288dde7cb00a6cefeef (patch) | |
tree | d19e51f41505b4170097312e74a94db04b3c4df1 /crates | |
parent | 6b588004c6853eeef9557ddcef90304d612367c0 (diff) |
relative-path 1.0
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_batch/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_cli/src/analysis_stats.rs | 2 | ||||
-rw-r--r-- | crates/ra_db/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_hir/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_ide_api/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_ide_api/src/db.rs | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 4 | ||||
-rw-r--r-- | crates/ra_vfs_glob/Cargo.toml | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/crates/ra_batch/Cargo.toml b/crates/ra_batch/Cargo.toml index 62850746f..c85da7a2c 100644 --- a/crates/ra_batch/Cargo.toml +++ b/crates/ra_batch/Cargo.toml | |||
@@ -9,7 +9,7 @@ log = "0.4.5" | |||
9 | rustc-hash = "1.0" | 9 | rustc-hash = "1.0" |
10 | crossbeam-channel = "0.3.5" | 10 | crossbeam-channel = "0.3.5" |
11 | 11 | ||
12 | ra_vfs = "0.4.0" | 12 | ra_vfs = "0.5.0" |
13 | ra_vfs_glob = { path = "../ra_vfs_glob" } | 13 | ra_vfs_glob = { path = "../ra_vfs_glob" } |
14 | ra_db = { path = "../ra_db" } | 14 | ra_db = { path = "../ra_db" } |
15 | ra_ide_api = { path = "../ra_ide_api" } | 15 | ra_ide_api = { path = "../ra_ide_api" } |
diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs index 35c867dce..cda5cafb8 100644 --- a/crates/ra_cli/src/analysis_stats.rs +++ b/crates/ra_cli/src/analysis_stats.rs | |||
@@ -143,7 +143,7 @@ pub fn run( | |||
143 | ); | 143 | ); |
144 | bar.println(format!( | 144 | bar.println(format!( |
145 | "{} {}:{}-{}:{}: Expected {}, got {}", | 145 | "{} {}:{}-{}:{}: Expected {}, got {}", |
146 | path.display(), | 146 | path, |
147 | start.line + 1, | 147 | start.line + 1, |
148 | start.col_utf16, | 148 | start.col_utf16, |
149 | end.line + 1, | 149 | end.line + 1, |
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml index c141f1a88..3394ae8ce 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml | |||
@@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"] | |||
6 | 6 | ||
7 | [dependencies] | 7 | [dependencies] |
8 | salsa = "0.13.0" | 8 | salsa = "0.13.0" |
9 | relative-path = "0.4.0" | 9 | relative-path = "1.0.0" |
10 | rustc-hash = "1.0" | 10 | rustc-hash = "1.0" |
11 | 11 | ||
12 | ra_syntax = { path = "../ra_syntax" } | 12 | ra_syntax = { path = "../ra_syntax" } |
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml index 7820a12e9..edf1fa49b 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml | |||
@@ -7,7 +7,7 @@ authors = ["rust-analyzer developers"] | |||
7 | [dependencies] | 7 | [dependencies] |
8 | arrayvec = "0.5.1" | 8 | arrayvec = "0.5.1" |
9 | log = "0.4.5" | 9 | log = "0.4.5" |
10 | relative-path = "0.4.0" | 10 | relative-path = "1.0.0" |
11 | rustc-hash = "1.0" | 11 | rustc-hash = "1.0" |
12 | parking_lot = "0.9.0" | 12 | parking_lot = "0.9.0" |
13 | ena = "0.13" | 13 | ena = "0.13" |
diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml index f919a2d61..73f39b647 100644 --- a/crates/ra_ide_api/Cargo.toml +++ b/crates/ra_ide_api/Cargo.toml | |||
@@ -12,7 +12,7 @@ format-buf = "1.0.0" | |||
12 | itertools = "0.8.0" | 12 | itertools = "0.8.0" |
13 | join_to_string = "0.1.3" | 13 | join_to_string = "0.1.3" |
14 | log = "0.4.5" | 14 | log = "0.4.5" |
15 | relative-path = "0.4.0" | 15 | relative-path = "1.0.0" |
16 | rayon = "1.0.2" | 16 | rayon = "1.0.2" |
17 | fst = { version = "0.3.1", default-features = false } | 17 | fst = { version = "0.3.1", default-features = false } |
18 | rustc-hash = "1.0" | 18 | rustc-hash = "1.0" |
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs index bbf04bcf7..9146b647a 100644 --- a/crates/ra_ide_api/src/db.rs +++ b/crates/ra_ide_api/src/db.rs | |||
@@ -58,7 +58,7 @@ impl hir::debug::HirDebugHelper for RootDatabase { | |||
58 | let source_root_id = self.file_source_root(file_id); | 58 | let source_root_id = self.file_source_root(file_id); |
59 | let source_root_path = self.debug_data.root_paths.get(&source_root_id)?; | 59 | let source_root_path = self.debug_data.root_paths.get(&source_root_id)?; |
60 | let file_path = self.file_relative_path(file_id); | 60 | let file_path = self.file_relative_path(file_id); |
61 | Some(format!("{}/{}", source_root_path, file_path.display())) | 61 | Some(format!("{}/{}", source_root_path, file_path)) |
62 | } | 62 | } |
63 | } | 63 | } |
64 | 64 | ||
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 46a0f958c..dd4d3bf9a 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -6,7 +6,7 @@ authors = ["rust-analyzer developers"] | |||
6 | 6 | ||
7 | [dependencies] | 7 | [dependencies] |
8 | threadpool = "1.7.1" | 8 | threadpool = "1.7.1" |
9 | relative-path = "0.4.0" | 9 | relative-path = "1.0.0" |
10 | serde_json = "1.0.34" | 10 | serde_json = "1.0.34" |
11 | serde = { version = "1.0.83", features = ["derive"] } | 11 | serde = { version = "1.0.83", features = ["derive"] } |
12 | crossbeam-channel = "0.3.5" | 12 | crossbeam-channel = "0.3.5" |
@@ -16,7 +16,7 @@ lsp-types = { version = "0.61.0", features = ["proposed"] } | |||
16 | rustc-hash = "1.0" | 16 | rustc-hash = "1.0" |
17 | parking_lot = "0.9.0" | 17 | parking_lot = "0.9.0" |
18 | jod-thread = "0.1.0" | 18 | jod-thread = "0.1.0" |
19 | ra_vfs = "0.4.0" | 19 | ra_vfs = "0.5.0" |
20 | ra_syntax = { path = "../ra_syntax" } | 20 | ra_syntax = { path = "../ra_syntax" } |
21 | ra_text_edit = { path = "../ra_text_edit" } | 21 | ra_text_edit = { path = "../ra_text_edit" } |
22 | ra_ide_api = { path = "../ra_ide_api" } | 22 | ra_ide_api = { path = "../ra_ide_api" } |
diff --git a/crates/ra_vfs_glob/Cargo.toml b/crates/ra_vfs_glob/Cargo.toml index d1073b2be..83749675f 100644 --- a/crates/ra_vfs_glob/Cargo.toml +++ b/crates/ra_vfs_glob/Cargo.toml | |||
@@ -5,5 +5,5 @@ version = "0.1.0" | |||
5 | authors = ["rust-analyzer developers"] | 5 | authors = ["rust-analyzer developers"] |
6 | 6 | ||
7 | [dependencies] | 7 | [dependencies] |
8 | ra_vfs = "0.4.0" | 8 | ra_vfs = "0.5.0" |
9 | globset = "0.4.4" | 9 | globset = "0.4.4" |