Update to rust master

Author: alexcrichton

Cargo.toml

@@ -16,3 +16,4 @@ time = "0.1"
 [dev-dependencies]
 civet = "0.7"
 conduit-test = "0.7"
+tempdir = "0.3"

src/lib.rs

@@ -1,10 +1,10 @@
-#![feature(io, path, core, fs)]
+#![feature(io, path, core, fs_time)]
 #![cfg_attr(test, deny(warnings))]
-#![cfg_attr(test, feature(old_io, old_path))]
 
 extern crate conduit;
 extern crate "conduit-mime-types" as mime;
 extern crate time;
+#[cfg(test)] extern crate tempdir;
 
 use std::collections::HashMap;
 use std::error::Error;
@@ -14,8 +14,6 @@ use std::path::{PathBuf, AsPath};
 use std::fs::File;
 use conduit::{Request, Response, Handler};
 
-#[cfg(test)] mod tempdir;
-
 pub struct Static {
     path: PathBuf,
     types: mime::Types