Fix changes to channels

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notify"
-version = "1.1.0"
+version = "1.1.1"
 authors = [
   "Félix Saparelli <me@passcod.name>",
   "Antti Keränen <detegr@gmail.com>"

README.md

@@ -6,7 +6,7 @@ _Cross-platform filesystem notification library for Rust._
 
 ```toml
 [dependencies]
-notify = "1.0"
+notify = "1.1"
 ```
 
 Notify uses semver, so only major versions break backward compatibility. While

src/inotify/mod.rs

@@ -1,10 +1,11 @@
 extern crate "inotify" as inotify_sys;
 extern crate libc;
 
-use self::inotify_sys::wrapper::{mod, INotify, Watch};
+use self::inotify_sys::wrapper::{self, INotify, Watch};
 use std::collections::HashMap;
 use std::io::IoErrorKind;
 use std::sync::{Arc, RWLock};
+use std::sync::mpsc::Sender;
 use std::thread::Thread;
 use super::{Error, Event, op, Op, Watcher};
 use std::io::fs::{PathExtensions, walk_dir};
@@ -35,7 +36,7 @@ impl INotifyWatcher {
             match e.kind {
               IoErrorKind::EndOfFile => break,
               _ => {
-                let _ = tx.send_opt(Event {
+                let _ = tx.send(Event {
                   path: None,
                   op: Err(Error::Io(e))
                 });
@@ -105,10 +106,10 @@ fn handle_event(event: wrapper::Event, tx: &Sender<Event>, paths: &Arc<RWLock<Ha
     false => Path::new_opt(event.name)
   };
 
-  tx.send(Event {
+  let _ = tx.send(Event {
     path: path,
     op: Ok(o)
-  })
+  });
 }
 
 impl Watcher for INotifyWatcher {

src/lib.rs

@@ -2,6 +2,8 @@
 #[phase(plugin, link)] extern crate log;
 
 use std::io::IoError;
+use std::sync::mpsc::Sender;
+#[cfg(test)] use std::sync::mpsc::channel;
 pub use self::op::Op;
 #[cfg(target_os="linux")]
 pub use self::inotify::INotifyWatcher;

src/poll.rs

@@ -1,6 +1,7 @@
 use std::collections::{HashMap, HashSet};
-use std::io::fs::{mod, PathExtensions};
+use std::io::fs::{self, PathExtensions};
 use std::sync::{Arc, RWLock};
+use std::sync::mpsc::Sender;
 use std::thread::Thread;
 use super::{Error, Event, op, Watcher};
 
@@ -30,7 +31,7 @@ impl PollWatcher {
 
         for watch in watches.read().unwrap().iter() {
           if !watch.exists() {
-            tx.send(Event {
+            let _ = tx.send(Event {
               path: Some(watch.clone()),
               op: Err(Error::PathNotFound)
             });
@@ -39,7 +40,7 @@ impl PollWatcher {
 
           match watch.lstat() {
             Err(e) => {
-              tx.send(Event {
+              let _ = tx.send(Event {
                 path: Some(watch.clone()),
                 op: Err(Error::Io(e))
               });
@@ -50,7 +51,7 @@ impl PollWatcher {
                 None => continue, // First run
                 Some(old) => {
                   if stat.modified > old {
-                    tx.send(Event {
+                    let _ = tx.send(Event {
                       path: Some(watch.clone()),
                       op: Ok(op::WRITE)
                     });
@@ -65,7 +66,7 @@ impl PollWatcher {
           // TODO: more efficient implementation where the dir tree is cached?
           match fs::walk_dir(watch) {
             Err(e) => {
-              tx.send(Event {
+              let _ = tx.send(Event {
                 path: Some(watch.clone()),
                 op: Err(Error::Io(e))
               });
@@ -75,7 +76,7 @@ impl PollWatcher {
               for path in iter {
                 match path.lstat() {
                   Err(e) => {
-                    tx.send(Event {
+                    let _ = tx.send(Event {
                       path: Some(path.clone()),
                       op: Err(Error::Io(e))
                     });
@@ -86,7 +87,7 @@ impl PollWatcher {
                       None => continue, // First run
                       Some(old) => {
                         if stat.modified > old {
-                          tx.send(Event {
+                          let _ = tx.send(Event {
                             path: Some(path.clone()),
                             op: Ok(op::WRITE)
                           });