Completed renaming of AddWatchFlags and InitFlags.

Author: vdagonneau

src/sys/inotify.rs

@@ -8,13 +8,13 @@
 //!
 //! Monitor all events happening in directory "test":
 //! ```no_run
-//! # use nix::sys::inotify::{EventFlags,InotifyInitFlags,Inotify};
+//! # use nix::sys::inotify::{AddWatchFlags,InitFlags,Inotify};
 //! #
 //! // We create a new inotify instance.
-//! let instance = Inotify::init(InotifyInitFlags::empty()).unwrap();
+//! let instance = Inotify::init(InitFlags::empty()).unwrap();
 //!
 //! // We add a new watch on directory "test" for all events.
-//! let wd = instance.add_watch("test", EventFlags::IN_ALL_EVENTS).unwrap();
+//! let wd = instance.add_watch("test", AddWatchFlags::IN_ALL_EVENTS).unwrap();
 //!
 //! loop {
 //!     // We read from our inotify instance for events.

test/sys/test_inotify.rs

@@ -1,4 +1,4 @@
-use nix::sys::inotify::{EventFlags,InotifyInitFlags,Inotify};
+use nix::sys::inotify::{AddWatchFlags,InitFlags,Inotify};
 use nix::Error;
 use nix::errno::Errno;
 use tempfile;
@@ -7,11 +7,11 @@ use std::fs::{rename, File};
 
 #[test]
 pub fn test_inotify() {
-    let instance = Inotify::init(InotifyInitFlags::IN_NONBLOCK)
+    let instance = Inotify::init(InitFlags::IN_NONBLOCK)
         .unwrap();
     let tempdir = tempfile::tempdir().unwrap();
 
-    instance.add_watch(tempdir.path(), EventFlags::IN_ALL_EVENTS).unwrap();
+    instance.add_watch(tempdir.path(), AddWatchFlags::IN_ALL_EVENTS).unwrap();
 
     let events = instance.read_events();
     assert_eq!(events.unwrap_err(), Error::Sys(Errno::EAGAIN));
@@ -24,11 +24,11 @@ pub fn test_inotify() {
 
 #[test]
 pub fn test_inotify_multi_events() {
-    let instance = Inotify::init(InotifyInitFlags::IN_NONBLOCK)
+    let instance = Inotify::init(InitFlags::IN_NONBLOCK)
         .unwrap();
     let tempdir = tempfile::tempdir().unwrap();
 
-    instance.add_watch(tempdir.path(), EventFlags::IN_ALL_EVENTS).unwrap();
+    instance.add_watch(tempdir.path(), AddWatchFlags::IN_ALL_EVENTS).unwrap();
 
     let events = instance.read_events();
     assert_eq!(events.unwrap_err(), Error::Sys(Errno::EAGAIN));
@@ -46,19 +46,19 @@ pub fn test_inotify_multi_events() {
     let events = instance.read_events().unwrap();
     assert_eq!(events.len(), 5);
 
-    assert_eq!(events[0].mask, EventFlags::IN_CREATE);
+    assert_eq!(events[0].mask, AddWatchFlags::IN_CREATE);
     assert_eq!(events[0].name, Some(OsString::from("test")));
 
-    assert_eq!(events[1].mask, EventFlags::IN_OPEN);
+    assert_eq!(events[1].mask, AddWatchFlags::IN_OPEN);
     assert_eq!(events[1].name, Some(OsString::from("test")));
 
-    assert_eq!(events[2].mask, EventFlags::IN_CLOSE_WRITE);
+    assert_eq!(events[2].mask, AddWatchFlags::IN_CLOSE_WRITE);
     assert_eq!(events[2].name, Some(OsString::from("test")));
 
-    assert_eq!(events[3].mask, EventFlags::IN_MOVED_FROM);
+    assert_eq!(events[3].mask, AddWatchFlags::IN_MOVED_FROM);
     assert_eq!(events[3].name, Some(OsString::from("test")));
 
-    assert_eq!(events[4].mask, EventFlags::IN_MOVED_TO);
+    assert_eq!(events[4].mask, AddWatchFlags::IN_MOVED_TO);
     assert_eq!(events[4].name, Some(OsString::from("test2")));
 
     assert_eq!(events[3].cookie, events[4].cookie);