aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock24
-rw-r--r--crates/ra_batch/Cargo.toml2
-rw-r--r--crates/ra_cli/src/analysis_stats.rs2
-rw-r--r--crates/ra_db/Cargo.toml2
-rw-r--r--crates/ra_hir/Cargo.toml2
-rw-r--r--crates/ra_ide_api/Cargo.toml2
-rw-r--r--crates/ra_ide_api/src/db.rs2
-rw-r--r--crates/ra_lsp_server/Cargo.toml4
-rw-r--r--crates/ra_vfs_glob/Cargo.toml2
9 files changed, 21 insertions, 21 deletions
diff --git a/Cargo.lock b/Cargo.lock
index bb5e81bae..a0544e7a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -937,7 +937,7 @@ dependencies = [
937 "ra_hir 0.1.0", 937 "ra_hir 0.1.0",
938 "ra_ide_api 0.1.0", 938 "ra_ide_api 0.1.0",
939 "ra_project_model 0.1.0", 939 "ra_project_model 0.1.0",
940 "ra_vfs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 940 "ra_vfs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
941 "ra_vfs_glob 0.1.0", 941 "ra_vfs_glob 0.1.0",
942 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 942 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
943] 943]
@@ -974,7 +974,7 @@ dependencies = [
974 "ra_cfg 0.1.0", 974 "ra_cfg 0.1.0",
975 "ra_prof 0.1.0", 975 "ra_prof 0.1.0",
976 "ra_syntax 0.1.0", 976 "ra_syntax 0.1.0",
977 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 977 "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
978 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 978 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
979 "salsa 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", 979 "salsa 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
980] 980]
@@ -1008,7 +1008,7 @@ dependencies = [
1008 "ra_prof 0.1.0", 1008 "ra_prof 0.1.0",
1009 "ra_syntax 0.1.0", 1009 "ra_syntax 0.1.0",
1010 "ra_tt 0.1.0", 1010 "ra_tt 0.1.0",
1011 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1011 "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1012 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1012 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1013 "test_utils 0.1.0", 1013 "test_utils 0.1.0",
1014] 1014]
@@ -1034,7 +1034,7 @@ dependencies = [
1034 "ra_text_edit 0.1.0", 1034 "ra_text_edit 0.1.0",
1035 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", 1035 "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
1036 "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", 1036 "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
1037 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1037 "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1038 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1038 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1039 "superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", 1039 "superslice 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1040 "test_utils 0.1.0", 1040 "test_utils 0.1.0",
@@ -1057,9 +1057,9 @@ dependencies = [
1057 "ra_project_model 0.1.0", 1057 "ra_project_model 0.1.0",
1058 "ra_syntax 0.1.0", 1058 "ra_syntax 0.1.0",
1059 "ra_text_edit 0.1.0", 1059 "ra_text_edit 0.1.0",
1060 "ra_vfs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1060 "ra_vfs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
1061 "ra_vfs_glob 0.1.0", 1061 "ra_vfs_glob 0.1.0",
1062 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1062 "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1063 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1063 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1064 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", 1064 "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
1065 "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", 1065 "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1161,7 +1161,7 @@ dependencies = [
1161 1161
1162[[package]] 1162[[package]]
1163name = "ra_vfs" 1163name = "ra_vfs"
1164version = "0.4.0" 1164version = "0.5.0"
1165source = "registry+https://github.com/rust-lang/crates.io-index" 1165source = "registry+https://github.com/rust-lang/crates.io-index"
1166dependencies = [ 1166dependencies = [
1167 "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", 1167 "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1169,7 +1169,7 @@ dependencies = [
1169 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", 1169 "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
1170 "notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)", 1170 "notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
1171 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", 1171 "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
1172 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1172 "relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
1173 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1173 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1174 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", 1174 "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
1175] 1175]
@@ -1179,7 +1179,7 @@ name = "ra_vfs_glob"
1179version = "0.1.0" 1179version = "0.1.0"
1180dependencies = [ 1180dependencies = [
1181 "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", 1181 "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
1182 "ra_vfs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1182 "ra_vfs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
1183] 1183]
1184 1184
1185[[package]] 1185[[package]]
@@ -1378,7 +1378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1378 1378
1379[[package]] 1379[[package]]
1380name = "relative-path" 1380name = "relative-path"
1381version = "0.4.0" 1381version = "1.0.0"
1382source = "registry+https://github.com/rust-lang/crates.io-index" 1382source = "registry+https://github.com/rust-lang/crates.io-index"
1383 1383
1384[[package]] 1384[[package]]
@@ -1907,7 +1907,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1907"checksum psm 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "54639efee26275dfadc49644039c31c73673edde0ef2815acf25a8db526ee193" 1907"checksum psm 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "54639efee26275dfadc49644039c31c73673edde0ef2815acf25a8db526ee193"
1908"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" 1908"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
1909"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" 1909"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
1910"checksum ra_vfs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdf6a0926414eb0c00866eb9274894182302f879cd06b5459c1d8ee7f1234aed" 1910"checksum ra_vfs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc8f508bc7a9871b81b6ee75e15d0bbc9f81a96698364a090a8d10b0f8b970b7"
1911"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" 1911"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
1912"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" 1912"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
1913"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" 1913"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
@@ -1929,7 +1929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1929"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" 1929"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
1930"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" 1930"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
1931"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" 1931"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
1932"checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c" 1932"checksum relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bedde000f40f2921ce439ea165c9c53fd629bfa115140c72e22aceacb4a21954"
1933"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" 1933"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
1934"checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5" 1934"checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
1935"checksum rowan 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dc2b79612dedc9004083a61448eb669d336d56690aab29fbd7249e8c8ab41d8c" 1935"checksum rowan 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dc2b79612dedc9004083a61448eb669d336d56690aab29fbd7249e8c8ab41d8c"
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"
9rustc-hash = "1.0" 9rustc-hash = "1.0"
10crossbeam-channel = "0.3.5" 10crossbeam-channel = "0.3.5"
11 11
12ra_vfs = "0.4.0" 12ra_vfs = "0.5.0"
13ra_vfs_glob = { path = "../ra_vfs_glob" } 13ra_vfs_glob = { path = "../ra_vfs_glob" }
14ra_db = { path = "../ra_db" } 14ra_db = { path = "../ra_db" }
15ra_ide_api = { path = "../ra_ide_api" } 15ra_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]
8salsa = "0.13.0" 8salsa = "0.13.0"
9relative-path = "0.4.0" 9relative-path = "1.0.0"
10rustc-hash = "1.0" 10rustc-hash = "1.0"
11 11
12ra_syntax = { path = "../ra_syntax" } 12ra_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]
8arrayvec = "0.5.1" 8arrayvec = "0.5.1"
9log = "0.4.5" 9log = "0.4.5"
10relative-path = "0.4.0" 10relative-path = "1.0.0"
11rustc-hash = "1.0" 11rustc-hash = "1.0"
12parking_lot = "0.9.0" 12parking_lot = "0.9.0"
13ena = "0.13" 13ena = "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"
12itertools = "0.8.0" 12itertools = "0.8.0"
13join_to_string = "0.1.3" 13join_to_string = "0.1.3"
14log = "0.4.5" 14log = "0.4.5"
15relative-path = "0.4.0" 15relative-path = "1.0.0"
16rayon = "1.0.2" 16rayon = "1.0.2"
17fst = { version = "0.3.1", default-features = false } 17fst = { version = "0.3.1", default-features = false }
18rustc-hash = "1.0" 18rustc-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]
8threadpool = "1.7.1" 8threadpool = "1.7.1"
9relative-path = "0.4.0" 9relative-path = "1.0.0"
10serde_json = "1.0.34" 10serde_json = "1.0.34"
11serde = { version = "1.0.83", features = ["derive"] } 11serde = { version = "1.0.83", features = ["derive"] }
12crossbeam-channel = "0.3.5" 12crossbeam-channel = "0.3.5"
@@ -16,7 +16,7 @@ lsp-types = { version = "0.61.0", features = ["proposed"] }
16rustc-hash = "1.0" 16rustc-hash = "1.0"
17parking_lot = "0.9.0" 17parking_lot = "0.9.0"
18jod-thread = "0.1.0" 18jod-thread = "0.1.0"
19ra_vfs = "0.4.0" 19ra_vfs = "0.5.0"
20ra_syntax = { path = "../ra_syntax" } 20ra_syntax = { path = "../ra_syntax" }
21ra_text_edit = { path = "../ra_text_edit" } 21ra_text_edit = { path = "../ra_text_edit" }
22ra_ide_api = { path = "../ra_ide_api" } 22ra_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"
5authors = ["rust-analyzer developers"] 5authors = ["rust-analyzer developers"]
6 6
7[dependencies] 7[dependencies]
8ra_vfs = "0.4.0" 8ra_vfs = "0.5.0"
9globset = "0.4.4" 9globset = "0.4.4"