Update to rust master

Author: alexcrichton

src/lib.rs

@@ -168,8 +168,8 @@ pub fn glob_with(pattern: &str, options: &MatchOptions) -> Result<Paths, Pattern
     let scope = root.map(to_scope).unwrap_or_else(|| Path::new("."));
 
     let mut dir_patterns = Vec::new();
-    let mut components = pattern[cmp::min(root_len, pattern.len())..]
-                                .split_terminator(is_sep);
+    let components = pattern[cmp::min(root_len, pattern.len())..]
+                            .split_terminator(is_sep);
 
     for component in components {
         let compiled = try!(Pattern::new(component));

tests/glob-std.rs

@@ -11,6 +11,8 @@
 // ignore-windows TempDir may cause IoError on windows: #10462
 #![feature(path, os, io)]
 
+#![feature(path, os, io)]
+
 extern crate glob;
 
 use glob::glob;
@@ -34,10 +36,6 @@ fn main() {
         }
     }
 
-    fn abs_path(path: &str) -> Path {
-        os::getcwd().unwrap().join(&Path::new(path))
-    }
-
     fn glob_vec(pattern: &str) -> Vec<Path> {
         glob(pattern).unwrap().map(|r| r.unwrap()).collect()
     }