aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock8
-rw-r--r--crates/ra_vfs/Cargo.toml3
-rw-r--r--crates/ra_vfs/src/lib.rs2
3 files changed, 6 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 41e84b7e9..db09967ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -702,8 +702,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
702 702
703[[package]] 703[[package]]
704name = "notify" 704name = "notify"
705version = "4.0.6" 705version = "4.0.7"
706source = "git+https://github.com/vemoo/notify/?branch=v4-legacy#8114796fb7b133ba8898ba5d08fda20856f666d4" 706source = "registry+https://github.com/rust-lang/crates.io-index"
707dependencies = [ 707dependencies = [
708 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 708 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
709 "filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", 709 "filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1011,7 +1011,7 @@ dependencies = [
1011 "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", 1011 "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
1012 "flexi_logger 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", 1012 "flexi_logger 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
1013 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1013 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1014 "notify 4.0.6 (git+https://github.com/vemoo/notify/?branch=v4-legacy)", 1014 "notify 4.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
1015 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1015 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
1016 "ra_arena 0.1.0", 1016 "ra_arena 0.1.0",
1017 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1017 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1899,7 +1899,7 @@ dependencies = [
1899"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" 1899"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
1900"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" 1900"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
1901"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" 1901"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
1902"checksum notify 4.0.6 (git+https://github.com/vemoo/notify/?branch=v4-legacy)" = "<none>" 1902"checksum notify 4.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c968cf37cf949114b00d51b0b23536d1c3a4a3963767cf4c969c65a6af78dc7d"
1903"checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d" 1903"checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d"
1904"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" 1904"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
1905"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" 1905"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
diff --git a/crates/ra_vfs/Cargo.toml b/crates/ra_vfs/Cargo.toml
index c7c4769b3..383381d2a 100644
--- a/crates/ra_vfs/Cargo.toml
+++ b/crates/ra_vfs/Cargo.toml
@@ -10,8 +10,7 @@ relative-path = "0.4.0"
10rustc-hash = "1.0" 10rustc-hash = "1.0"
11crossbeam-channel = "0.3.5" 11crossbeam-channel = "0.3.5"
12log = "0.4.6" 12log = "0.4.6"
13# until https://github.com/passcod/notify/issues/169 is fixed 13notify = "4.0.7"
14notify = { git = "https://github.com/vemoo/notify/", branch = "v4-legacy" }
15drop_bomb = "0.1.0" 14drop_bomb = "0.1.0"
16parking_lot = "0.7.0" 15parking_lot = "0.7.0"
17 16
diff --git a/crates/ra_vfs/src/lib.rs b/crates/ra_vfs/src/lib.rs
index 4f3896a82..bcff7928b 100644
--- a/crates/ra_vfs/src/lib.rs
+++ b/crates/ra_vfs/src/lib.rs
@@ -61,7 +61,7 @@ pub(crate) fn default_filter(path: &Path, rel_path: &RelativePath) -> bool {
61 if path.is_dir() { 61 if path.is_dir() {
62 for (i, c) in rel_path.components().enumerate() { 62 for (i, c) in rel_path.components().enumerate() {
63 if let Component::Normal(c) = c { 63 if let Component::Normal(c) = c {
64 // hardcoded for now 64 // TODO hardcoded for now
65 if (i == 0 && c == "target") || c == ".git" || c == "node_modules" { 65 if (i == 0 && c == "target") || c == ".git" || c == "node_modules" {
66 return false; 66 return false;
67 } 67 }