Update to rust master

alexcrichton · alexcrichton · commit d4f3cc4838c9 · 2015-03-01T11:11:55.000-08:00
diff --git a/examples/simple-file-server.rs b/examples/simple-file-server.rs
@@ -1,5 +1,3 @@
-#![feature(env, old_path)]
-
 extern crate civet;
 extern crate conduit;
 extern crate "conduit-static" as conduit_static;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#![feature(env, old_path)]`
`2`		`-`
`3`	`1`	`extern crate civet;`
`4`	`2`	`extern crate conduit;`
`5`	`3`	`extern crate "conduit-static" as conduit_static;`