rwf2/Rocket
1
0
Fork 0
mirror of https://github.com/rwf2/Rocket.git synced 2025-02-16 05:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update notify to 5.0.

Browse Source 
Resolves #2337.
This commit is contained in:
Jacob Simpson 2022-09-16 18:34:45 -07:00 committed by Sergio Benitez
parent 682c2d9acf
commit 6c3d35e7e5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/dyn_templates/Cargo.toml
View File

@ -18,7 +18,7 @@ handlebars = ["handlebars_"]
[dependencies]
glob = "0.3"
notify = "4.0.6"
notify = "5.0.0"
normpath = "0.3"
[dependencies.rocket]

8
contrib/dyn_templates/src/context.rs
View File

@ -115,7 +115,7 @@ mod manager {
use std::sync::{RwLock, Mutex};
use std::sync::mpsc::{channel, Receiver};
use notify::{raw_watcher, RawEvent, RecommendedWatcher, RecursiveMode, Watcher};
use notify::{recommended_watcher, Error, Event, RecommendedWatcher, RecursiveMode, Watcher};
use super::{Callback, Context};
@ -125,14 +125,14 @@ mod manager {
/// The current template context, inside an RwLock so it can be updated.
context: RwLock<Context>,
/// A filesystem watcher and the receive queue for its events.
watcher: Option<(RecommendedWatcher, Mutex<Receiver<RawEvent>>)>,
watcher: Option<(RecommendedWatcher, Mutex<Receiver<Result<Event, Error>>>)>,
}
impl ContextManager {
pub fn new(ctxt: Context) -> ContextManager {
let (tx, rx) = channel();
let watcher = raw_watcher(tx).and_then(|mut watcher| {
watcher.watch(ctxt.root.canonicalize()?, RecursiveMode::Recursive)?;
let watcher = recommended_watcher(tx).and_then(|mut watcher| {
watcher.watch(&ctxt.root.canonicalize()?, RecursiveMode::Recursive)?;
Ok(watcher)
});