Update to rust master

Cargo.toml

@@ -28,3 +28,4 @@ version = "0.2"
 docopt = "=0.6.40"
 rustc-serialize = "0.3"
 time = "0.1"
+tempdir = "0.3"

examples/status.rs

@@ -13,7 +13,7 @@
  */
 
 #![deny(warnings)]
-#![feature(old_io, std_misc, core, old_path)]
+#![feature(old_io, std_misc, core, path)]
 
 extern crate git2;
 extern crate docopt;
@@ -43,7 +43,7 @@ struct Args {
 enum Format { Long, Short, Porcelain }
 
 fn run(args: &Args) -> Result<(), Error> {
-    let path = args.flag_git_dir.as_ref().map(Path::new).unwrap_or(Path::new("."));
+    let path = args.flag_git_dir.clone().unwrap_or(".".to_string());
     let repo = try!(Repository::open(&path));
     if repo.is_bare() {
         return Err(Error::from_str("cannot report status on bare repository"))

libgit2-sys/build.rs

@@ -1,4 +1,4 @@
-#![feature(path, io, exit_status, core, old_io, fs)]
+#![feature(path, io)]
 
 extern crate "pkg-config" as pkg_config;
 
@@ -24,7 +24,7 @@ fn main() {
 
     if target.contains("i686") {
         cflags.push_str(" -m32");
-    } else if target.as_slice().contains("x86_64") {
+    } else if target.contains("x86_64") {
         cflags.push_str(" -m64");
     }
     if !target.contains("i686") {
@@ -41,7 +41,7 @@ fn main() {
     if mingw {
         cmd.arg("-G").arg("Unix Makefiles");
     }
-    let profile = match env::var("PROFILE").unwrap().as_slice() {
+    let profile = match &env::var("PROFILE").unwrap()[..] {
         "bench" | "release" => "Release",
         _ => "Debug",
     };
@@ -96,7 +96,7 @@ fn run(cmd: &mut Command, program: &str) {
 }
 
 fn register_dep(dep: &str) {
-    match env::var(format!("DEP_{}_ROOT", dep).as_slice()) {
+    match env::var(&format!("DEP_{}_ROOT", dep)) {
         Ok(s) => {
             append("CMAKE_PREFIX_PATH", PathBuf::new(&s));
             append("PKG_CONFIG_PATH", Path::new(&s).join("lib/pkgconfig"));
@@ -113,9 +113,5 @@ fn append(var: &str, val: PathBuf) {
 }
 
 fn fail(s: &str) -> ! {
-    use std::old_io;
-    println!("{}", s);
-    env::set_exit_status(1);
-    old_io::stdio::set_stderr(Box::new(old_io::util::NullWriter));
-    panic!()
+    panic!("\n{}\n\nbuild script failed, must exit now", s)
 }

src/blob.rs

@@ -56,7 +56,8 @@ impl<'repo> Drop for Blob<'repo> {
 #[cfg(test)]
 mod tests {
     use std::io::prelude::*;
-    use std::fs::{File, TempDir};
+    use std::fs::File;
+    use tempdir::TempDir;
     use Repository;
 
     #[test]

src/build.rs

@@ -439,8 +439,9 @@ extern fn progress_cb(path: *const c_char,
 
 #[cfg(test)]
 mod tests {
-    use std::fs::{self, TempDir};
+    use std::fs;
     use std::path::Path;
+    use tempdir::TempDir;
     use super::RepoBuilder;
     use Repository;
 

src/config.rs

@@ -418,7 +418,8 @@ impl<'cfg> Drop for ConfigEntries<'cfg> {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::{File, TempDir};
+    use std::fs::File;
+    use tempdir::TempDir;
 
     use Config;
 

src/cred.rs

@@ -342,9 +342,10 @@ impl CredentialHelper {
 #[cfg(test)]
 mod test {
     use std::env;
-    use std::fs::{self, File, TempDir};
+    use std::fs::{self, File};
     use std::io::prelude::*;
     use std::path::Path;
+    use tempdir::TempDir;
 
     use {Cred, Config, CredentialHelper, ConfigLevel};
 
@@ -445,7 +446,7 @@ echo username=c
     #[cfg(unix)]
     fn chmod(path: &Path) {
         use std::os::unix::prelude::*;
-        let mut perms = path.metadata().unwrap().permissions();
+        let mut perms = fs::metadata(path).unwrap().permissions();
         perms.set_mode(0o755);
         fs::set_permissions(path, perms).unwrap();
     }

src/index.rs

@@ -1,4 +1,4 @@
-use std::ffi::{CStr, OsString, OsStr};
+use std::ffi::{CStr, OsString};
 use std::iter::{Range, IntoIterator};
 use std::path::Path;
 
@@ -110,8 +110,8 @@ impl Index {
         // Git apparently expects '/' to be separators for paths
         let mut posix_path = OsString::new();
         for (i, comp) in path.components().enumerate() {
-            if i != 0 { posix_path.push_os_str(OsStr::from_str("/")); }
-            posix_path.push_os_str(comp.as_os_str());
+            if i != 0 { posix_path.push("/"); }
+            posix_path.push(comp.as_os_str());
         }
         let posix_path = try!(posix_path.into_c_string());
         unsafe {
@@ -468,8 +468,9 @@ impl Binding for IndexEntry {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::{self, File, TempDir};
+    use std::fs::{self, File};
     use std::path::Path;
+    use tempdir::TempDir;
 
     use {Index, Repository, ResetType};
 

src/lib.rs

@@ -64,16 +64,17 @@
 //! itself.
 
 #![doc(html_root_url = "http://alexcrichton.com/git2-rs")]
-#![feature(unsafe_destructor, std_misc, core, path, os)]
+#![feature(unsafe_destructor, std_misc, core, path)]
 #![feature(io)]
 #![deny(missing_docs)]
 #![cfg_attr(test, deny(warnings))]
-#![cfg_attr(test, feature(fs, tempdir))]
+#![cfg_attr(test, feature(fs))]
 
 extern crate libc;
 extern crate url;
 extern crate "libgit2-sys" as raw;
 #[macro_use] extern crate bitflags;
+#[cfg(test)] extern crate tempdir;
 
 use std::ffi::{CStr, CString};
 use std::fmt;

src/push.rs

@@ -111,7 +111,7 @@ impl<'a> Drop for Push<'a> {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::TempDir;
+    use tempdir::TempDir;
     use Repository;
 
     #[test]

src/remote.rs

@@ -392,7 +392,7 @@ impl<'remote> RemoteHead<'remote> {
 #[cfg(test)]
 mod tests {
     use std::cell::Cell;
-    use std::fs::TempDir;
+    use tempdir::TempDir;
     use {Repository, Remote, RemoteCallbacks, Direction};
 
     #[test]

src/repo.rs

@@ -1288,7 +1288,8 @@ impl RepositoryInitOptions {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::{self, TempDir};
+    use std::fs;
+    use tempdir::TempDir;
     use {Repository, ObjectType, ResetType};
 
     #[test]

src/submodule.rs

@@ -203,8 +203,8 @@ impl<'repo> Drop for Submodule<'repo> {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::TempDir;
     use std::path::Path;
+    use tempdir::TempDir;
 
     use Repository;
 

src/test.rs

@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
-use std::fs::TempDir;
 use std::io;
+use tempdir::TempDir;
 use url::Url;
 
 use Repository;