Update to rust master

Author: alexcrichton

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "git2"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"

examples/add.rs

@@ -12,6 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
+#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
@@ -21,7 +22,7 @@ extern crate "rustc-serialize" as rustc_serialize;
 use docopt::Docopt;
 use git2::Repository;
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_spec: Vec<String>,
     flag_dry_run: bool,

examples/clone.rs

@@ -12,6 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
+#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
@@ -24,7 +25,7 @@ use git2::build::{RepoBuilder, CheckoutBuilder};
 use std::cell::RefCell;
 use std::io::stdio;
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_url: String,
     arg_path: String,

examples/fetch.rs

@@ -12,6 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
+#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
@@ -23,7 +24,7 @@ use git2::{Repository, RemoteCallbacks, Direction};
 use std::io::stdio;
 use std::str;
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_remote: Option<String>,
 }

examples/init.rs

@@ -12,6 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
+#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
@@ -22,7 +23,7 @@ use docopt::Docopt;
 use git2::{Repository, RepositoryInitOptions, RepositoryInitMode, Error};
 use std::num::FromStrRadix;
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_directory: String,
     flag_quiet: bool,

examples/log.rs

@@ -12,7 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(macro_rules)]
+#![feature(macro_rules, old_orphan_check)]
 #![deny(warnings)]
 
 extern crate "rustc-serialize" as rustc_serialize;
@@ -25,7 +25,7 @@ use docopt::Docopt;
 use git2::{Repository, Signature, Commit, ObjectType, Time, DiffOptions};
 use git2::{Pathspec, Diff, Error, DiffFormat};
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_commit: Vec<String>,
     arg_spec: Vec<String>,

examples/ls-remote.rs

@@ -12,6 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
+#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
@@ -21,7 +22,7 @@ extern crate "rustc-serialize" as rustc_serialize;
 use docopt::Docopt;
 use git2::{Repository, Direction};
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_remote: String,
 }

examples/rev-list.rs

@@ -13,7 +13,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#![feature(slicing_syntax)]
+#![feature(slicing_syntax, old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
@@ -23,7 +23,7 @@ extern crate "rustc-serialize" as rustc_serialize;
 use docopt::Docopt;
 use git2::{Repository, Error, Revwalk, Oid};
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_spec: Vec<String>,
     flag_topo_order: bool,

examples/rev-parse.rs

@@ -12,6 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
+#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
@@ -21,7 +22,7 @@ extern crate "rustc-serialize" as rustc_serialize;
 use docopt::Docopt;
 use git2::Repository;
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_spec: String,
     flag_git_dir: Option<String>,

examples/status.rs

@@ -12,6 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
+#![feature(old_orphan_check)]
 #![deny(warnings)]
 
 extern crate git2;
@@ -22,7 +23,7 @@ use std::str;
 use docopt::Docopt;
 use git2::{Repository, Error, StatusOptions, ErrorCode};
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_spec: Vec<String>,
     flag_short: bool,
@@ -38,7 +39,7 @@ struct Args {
     flag_list_submodules: bool,
 }
 
-#[deriving(Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 enum Format { Long, Short, Porcelain }
 
 fn run(args: &Args) -> Result<(), Error> {

libgit2-sys/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "libgit2-sys"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 links = "git2"
 build = "build.rs"

libgit2-sys/build.rs

@@ -1,7 +1,7 @@
 extern crate "pkg-config" as pkg_config;
 
 use std::os;
-use std::io::{mod, fs, Command};
+use std::io::{self, fs, Command};
 use std::io::process::InheritFd;
 
 fn main() {