From c3045c68a95d34d9381dc288dde7cb00a6cefeef Mon Sep 17 00:00:00 2001 From: kjeremy Date: Tue, 15 Oct 2019 10:44:26 -0400 Subject: relative-path 1.0 --- crates/ra_batch/Cargo.toml | 2 +- crates/ra_cli/src/analysis_stats.rs | 2 +- crates/ra_db/Cargo.toml | 2 +- crates/ra_hir/Cargo.toml | 2 +- crates/ra_ide_api/Cargo.toml | 2 +- crates/ra_ide_api/src/db.rs | 2 +- crates/ra_lsp_server/Cargo.toml | 4 ++-- crates/ra_vfs_glob/Cargo.toml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'crates') 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" rustc-hash = "1.0" crossbeam-channel = "0.3.5" -ra_vfs = "0.4.0" +ra_vfs = "0.5.0" ra_vfs_glob = { path = "../ra_vfs_glob" } ra_db = { path = "../ra_db" } 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( ); bar.println(format!( "{} {}:{}-{}:{}: Expected {}, got {}", - path.display(), + path, start.line + 1, start.col_utf16, 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"] [dependencies] salsa = "0.13.0" -relative-path = "0.4.0" +relative-path = "1.0.0" rustc-hash = "1.0" 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"] [dependencies] arrayvec = "0.5.1" log = "0.4.5" -relative-path = "0.4.0" +relative-path = "1.0.0" rustc-hash = "1.0" parking_lot = "0.9.0" 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" itertools = "0.8.0" join_to_string = "0.1.3" log = "0.4.5" -relative-path = "0.4.0" +relative-path = "1.0.0" rayon = "1.0.2" fst = { version = "0.3.1", default-features = false } 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 { let source_root_id = self.file_source_root(file_id); let source_root_path = self.debug_data.root_paths.get(&source_root_id)?; let file_path = self.file_relative_path(file_id); - Some(format!("{}/{}", source_root_path, file_path.display())) + Some(format!("{}/{}", source_root_path, file_path)) } } 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"] [dependencies] threadpool = "1.7.1" -relative-path = "0.4.0" +relative-path = "1.0.0" serde_json = "1.0.34" serde = { version = "1.0.83", features = ["derive"] } crossbeam-channel = "0.3.5" @@ -16,7 +16,7 @@ lsp-types = { version = "0.61.0", features = ["proposed"] } rustc-hash = "1.0" parking_lot = "0.9.0" jod-thread = "0.1.0" -ra_vfs = "0.4.0" +ra_vfs = "0.5.0" ra_syntax = { path = "../ra_syntax" } ra_text_edit = { path = "../ra_text_edit" } 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" authors = ["rust-analyzer developers"] [dependencies] -ra_vfs = "0.4.0" +ra_vfs = "0.5.0" globset = "0.4.4" -- cgit v1.2.3