diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-23 16:53:56 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-23 16:53:56 +0100 |
commit | 0c12c4f9609ee72487af9b55a558b01af73ffe3e (patch) | |
tree | 29be52a980b4cae72f46a48c48135a15e31641e0 /Cargo.lock | |
parent | 7aa66371ee3e8b31217513204c8b4f683584419d (diff) | |
parent | dad1333b48c38bc7a5628fc0ff5304d003776a85 (diff) |
Merge #4976
4976: New VFS r=matklad a=matklad
Still a draft, but mostly working already.
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock index c91236fc6..f2069c55e 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -354,9 +354,9 @@ checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" | |||
354 | 354 | ||
355 | [[package]] | 355 | [[package]] |
356 | name = "fsevent" | 356 | name = "fsevent" |
357 | version = "0.4.0" | 357 | version = "2.0.2" |
358 | source = "registry+https://github.com/rust-lang/crates.io-index" | 358 | source = "registry+https://github.com/rust-lang/crates.io-index" |
359 | checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" | 359 | checksum = "97f347202c95c98805c216f9e1df210e8ebaec9fdb2365700a43c10797a35e63" |
360 | dependencies = [ | 360 | dependencies = [ |
361 | "bitflags", | 361 | "bitflags", |
362 | "fsevent-sys", | 362 | "fsevent-sys", |
@@ -364,9 +364,9 @@ dependencies = [ | |||
364 | 364 | ||
365 | [[package]] | 365 | [[package]] |
366 | name = "fsevent-sys" | 366 | name = "fsevent-sys" |
367 | version = "2.0.1" | 367 | version = "3.0.2" |
368 | source = "registry+https://github.com/rust-lang/crates.io-index" | 368 | source = "registry+https://github.com/rust-lang/crates.io-index" |
369 | checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" | 369 | checksum = "77a29c77f1ca394c3e73a9a5d24cfcabb734682d9634fc398f2204a63c994120" |
370 | dependencies = [ | 370 | dependencies = [ |
371 | "libc", | 371 | "libc", |
372 | ] | 372 | ] |
@@ -483,9 +483,9 @@ dependencies = [ | |||
483 | 483 | ||
484 | [[package]] | 484 | [[package]] |
485 | name = "inotify" | 485 | name = "inotify" |
486 | version = "0.7.1" | 486 | version = "0.8.3" |
487 | source = "registry+https://github.com/rust-lang/crates.io-index" | 487 | source = "registry+https://github.com/rust-lang/crates.io-index" |
488 | checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" | 488 | checksum = "46dd0a94b393c730779ccfd2a872b67b1eb67be3fc33082e733bdb38b5fde4d4" |
489 | dependencies = [ | 489 | dependencies = [ |
490 | "bitflags", | 490 | "bitflags", |
491 | "inotify-sys", | 491 | "inotify-sys", |
@@ -766,11 +766,13 @@ dependencies = [ | |||
766 | 766 | ||
767 | [[package]] | 767 | [[package]] |
768 | name = "notify" | 768 | name = "notify" |
769 | version = "4.0.15" | 769 | version = "5.0.0-pre.3" |
770 | source = "registry+https://github.com/rust-lang/crates.io-index" | 770 | source = "registry+https://github.com/rust-lang/crates.io-index" |
771 | checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" | 771 | checksum = "77d03607cf88b4b160ba0e9ed425fff3cee3b55ac813f0c685b3a3772da37d0e" |
772 | dependencies = [ | 772 | dependencies = [ |
773 | "anymap", | ||
773 | "bitflags", | 774 | "bitflags", |
775 | "crossbeam-channel", | ||
774 | "filetime", | 776 | "filetime", |
775 | "fsevent", | 777 | "fsevent", |
776 | "fsevent-sys", | 778 | "fsevent-sys", |
@@ -952,7 +954,9 @@ dependencies = [ | |||
952 | "relative-path", | 954 | "relative-path", |
953 | "rustc-hash", | 955 | "rustc-hash", |
954 | "salsa", | 956 | "salsa", |
957 | "stdx", | ||
955 | "test_utils", | 958 | "test_utils", |
959 | "vfs", | ||
956 | ] | 960 | ] |
957 | 961 | ||
958 | [[package]] | 962 | [[package]] |
@@ -1233,22 +1237,6 @@ dependencies = [ | |||
1233 | ] | 1237 | ] |
1234 | 1238 | ||
1235 | [[package]] | 1239 | [[package]] |
1236 | name = "ra_vfs" | ||
1237 | version = "0.6.1" | ||
1238 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1239 | checksum = "cbf31a173fc77ec59c27cf39af6baa137b40f4dbd45a8b3eccb1b2e4cfc922c1" | ||
1240 | dependencies = [ | ||
1241 | "crossbeam-channel", | ||
1242 | "jod-thread", | ||
1243 | "log", | ||
1244 | "notify", | ||
1245 | "parking_lot", | ||
1246 | "relative-path", | ||
1247 | "rustc-hash", | ||
1248 | "walkdir", | ||
1249 | ] | ||
1250 | |||
1251 | [[package]] | ||
1252 | name = "rand" | 1240 | name = "rand" |
1253 | version = "0.7.3" | 1241 | version = "0.7.3" |
1254 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1242 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1405,7 +1393,6 @@ dependencies = [ | |||
1405 | "ra_syntax", | 1393 | "ra_syntax", |
1406 | "ra_text_edit", | 1394 | "ra_text_edit", |
1407 | "ra_tt", | 1395 | "ra_tt", |
1408 | "ra_vfs", | ||
1409 | "rand", | 1396 | "rand", |
1410 | "rustc-hash", | 1397 | "rustc-hash", |
1411 | "serde", | 1398 | "serde", |
@@ -1414,6 +1401,8 @@ dependencies = [ | |||
1414 | "tempfile", | 1401 | "tempfile", |
1415 | "test_utils", | 1402 | "test_utils", |
1416 | "threadpool", | 1403 | "threadpool", |
1404 | "vfs", | ||
1405 | "vfs-notify", | ||
1417 | "winapi 0.3.8", | 1406 | "winapi 0.3.8", |
1418 | ] | 1407 | ] |
1419 | 1408 | ||
@@ -1764,11 +1753,22 @@ dependencies = [ | |||
1764 | name = "vfs" | 1753 | name = "vfs" |
1765 | version = "0.1.0" | 1754 | version = "0.1.0" |
1766 | dependencies = [ | 1755 | dependencies = [ |
1756 | "paths", | ||
1757 | "rustc-hash", | ||
1758 | ] | ||
1759 | |||
1760 | [[package]] | ||
1761 | name = "vfs-notify" | ||
1762 | version = "0.1.0" | ||
1763 | dependencies = [ | ||
1767 | "crossbeam-channel", | 1764 | "crossbeam-channel", |
1768 | "globset", | 1765 | "globset", |
1769 | "jod-thread", | 1766 | "jod-thread", |
1767 | "log", | ||
1768 | "notify", | ||
1770 | "paths", | 1769 | "paths", |
1771 | "rustc-hash", | 1770 | "rustc-hash", |
1771 | "vfs", | ||
1772 | "walkdir", | 1772 | "walkdir", |
1773 | ] | 1773 | ] |
1774 | 1774 | ||