Use crates.io Walker instead of unstable fs::walk_dir

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notify"
-version = "1.2.1"
+version = "1.2.3"
 authors = [
   "Félix Saparelli <[email protected]>",
   "Antti Keränen <[email protected]>",
@@ -22,8 +22,11 @@ keywords = [
 ]
 
 [dependencies]
-time = "*"
 bitflags = "*"
+libc = "*"
+log = "*"
+time = "*"
+walker = "^1.0.0"
 
 [target.x86_64-unknown-linux-gnu.dependencies.inotify]
 version = "^0.1"

src/lib.rs

@@ -1,5 +1,3 @@
-#![feature(rustc_private, libc, fs_time, fs_walk, path_ext)]
-
 #[macro_use] extern crate log;
 #[macro_use] extern crate bitflags;
 

src/poll.rs

@@ -3,8 +3,11 @@ use std::sync::{Arc, RwLock};
 use std::sync::mpsc::Sender;
 use std::thread;
 use super::{Error, Event, op, Watcher};
-use std::fs::{self, PathExt};
+use std::fs::PathExt;
 use std::path::{Path, PathBuf};
+use self::walker::Walker;
+
+extern crate walker;
 
 pub struct PollWatcher {
   tx: Sender<Event>,
@@ -63,9 +66,8 @@ impl PollWatcher {
             }
           }
 
-          // TODO: recurse into the dir
           // TODO: more efficient implementation where the dir tree is cached?
-          match fs::walk_dir(watch) {
+          match Walker::new(watch) {
             Err(e) => {
               let _ = tx.send(Event {
                 path: Some(watch.clone()),