aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-02-09 16:51:25 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-02-09 16:51:25 +0000
commit8bcb84ea681f982946a24b5e000ddde58247adba (patch)
treee3e99f6c03de6f7e456fe2488474ed2c59c16622
parentd0a32627a741826502692f2c3de71512b7ec23cf (diff)
parentc3c2e166b0eabcbf5c65337a658eaaa3850b1332 (diff)
Merge #771
771: update notify with fix for hight cpu usage r=matklad a=vemoo Should fix the ocasional 100% CPU hangs. I've tried `yes > test.rs` which would cause it before, and now on my computer it stays below 10%, and stops as soon as I interrupt the command, unlike previously which would stay at 100% for a while. Co-authored-by: Bernardo <[email protected]>
-rw-r--r--Cargo.lock6
-rw-r--r--crates/ra_vfs/Cargo.toml2
2 files changed, 4 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 56acb9a30..0009cdaab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -733,7 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
733 733
734[[package]] 734[[package]]
735name = "notify" 735name = "notify"
736version = "4.0.8" 736version = "4.0.9"
737source = "registry+https://github.com/rust-lang/crates.io-index" 737source = "registry+https://github.com/rust-lang/crates.io-index"
738dependencies = [ 738dependencies = [
739 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", 739 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1100,7 +1100,7 @@ dependencies = [
1100 "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", 1100 "drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
1101 "flexi_logger 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)", 1101 "flexi_logger 0.10.5 (registry+https://github.com/rust-lang/crates.io-index)",
1102 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1102 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1103 "notify 4.0.8 (registry+https://github.com/rust-lang/crates.io-index)", 1103 "notify 4.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
1104 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1104 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
1105 "ra_arena 0.1.0", 1105 "ra_arena 0.1.0",
1106 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1106 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1962,7 +1962,7 @@ dependencies = [
1962"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" 1962"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
1963"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" 1963"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
1964"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" 1964"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
1965"checksum notify 4.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c9b605e417814e88bb051c88a84f83655d6ad4fa32fc36d9a96296d86087692d" 1965"checksum notify 4.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9cc7ed2bd4b7edad3ee93b659c38e53dabb619f7274e127a0fab054ad2bb998d"
1966"checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d" 1966"checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d"
1967"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" 1967"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
1968"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" 1968"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 383381d2a..01109a9a7 100644
--- a/crates/ra_vfs/Cargo.toml
+++ b/crates/ra_vfs/Cargo.toml
@@ -10,7 +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"
13notify = "4.0.7" 13notify = "4.0.9"
14drop_bomb = "0.1.0" 14drop_bomb = "0.1.0"
15parking_lot = "0.7.0" 15parking_lot = "0.7.0"
16 16