forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump notify to 5.0.0-pre.11 (#2564)

Browse Source 
# Objective

notify 5.0.0-pre.11 breaks the interface again, but apparently in a way that's similar to how it used to be

## Solution

Bump `bevy_asset` dependency on notify to `5.0.0-pre.11` and fix the errors that crop up.

It looks like `pre.11` was mentioned in #2528 by @mockersf but there's no mention of why `pre.10` was chosen ultimately.
This commit is contained in:
Josh Kuhn 2021-07-29 23:56:16 +00:00
parent 155068a090
commit 54ff7aaa1e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bevy_asset/Cargo.toml
View File

@ -32,7 +32,7 @@ crossbeam-channel = "0.5.0"
anyhow = "1.0.4" anyhow = "1.0.4"
thiserror = "1.0" thiserror = "1.0"
downcast-rs = "1.2.0" downcast-rs = "1.2.0"
notify = { version = "=5.0.0-pre.10", optional = true } notify = { version = "=5.0.0-pre.11", optional = true }
parking_lot = "0.11.0" parking_lot = "0.11.0"
rand = "0.8.0" rand = "0.8.0"

4
crates/bevy_asset/src/filesystem_watcher.rs
View File

@ -12,7 +12,7 @@ pub struct FilesystemWatcher {
impl Default for FilesystemWatcher { impl Default for FilesystemWatcher {
fn default() -> Self { fn default() -> Self {
let (sender, receiver) = crossbeam_channel::unbounded(); let (sender, receiver) = crossbeam_channel::unbounded();
let watcher: RecommendedWatcher = Watcher::new_immediate(move |res| { let watcher: RecommendedWatcher = RecommendedWatcher::new(move |res| {
sender.send(res).expect("Watch event send failure."); sender.send(res).expect("Watch event send failure.");
}) })
.expect("Failed to create filesystem watcher."); .expect("Failed to create filesystem watcher.");
@ -22,6 +22,6 @@ impl Default for FilesystemWatcher {
impl FilesystemWatcher { impl FilesystemWatcher {
pub fn watch<P: AsRef<Path>>(&mut self, path: P) -> Result<()> { pub fn watch<P: AsRef<Path>>(&mut self, path: P) -> Result<()> {
self.watcher.watch(path, RecursiveMode::Recursive) self.watcher.watch(path.as_ref(), RecursiveMode::Recursive)
} }
} }