Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to work on latest nightly #9

Merged
merged 1 commit into from
Apr 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/inotify/mod.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
extern crate "inotify" as inotify_sys;
extern crate inotify as inotify_sys;
extern crate libc;

use self::inotify_sys::wrapper::{self, INotify, Watch};
use std::collections::HashMap;
use std::fs::{PathExt, walk_dir};
use std::sync::mpsc::Sender;
use std::sync::{Arc, RwLock};
use std::thread::Thread;
use std::thread;
use super::{Error, Event, op, Op, Watcher};
use std::path::{Path, PathBuf};

Expand All @@ -24,7 +24,7 @@ impl INotifyWatcher {
let mut ino = self.inotify.clone();
let tx = self.tx.clone();
let paths = self.paths.clone();
Thread::spawn(move || {
thread::spawn(move || {
loop {
match ino.wait_for_events() {
Ok(es) => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(path, io, core, rustc_private, libc, hash, std_misc, fs)]
#![feature(rustc_private, libc, fs_time, fs_walk, path_ext)]

#[macro_use] extern crate log;
#[macro_use] extern crate rustc_bitflags;
Expand Down
4 changes: 2 additions & 2 deletions src/poll.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::{HashMap, HashSet};
use std::sync::{Arc, RwLock};
use std::sync::mpsc::Sender;
use std::thread::Thread;
use std::thread;
use super::{Error, Event, op, Watcher};
use std::fs::{self, PathExt};
use std::path::{Path, PathBuf};
Expand All @@ -17,7 +17,7 @@ impl PollWatcher {
let tx = self.tx.clone();
let watches = self.watches.clone();
let open = self.open.clone();
Thread::spawn(move || {
thread::spawn(move || {
// In order of priority:
// TODO: populate mtimes before loop, and then handle creation events
// TODO: handle deletion events
Expand Down