From 30a48e05c22f2fbfde563a2ea87f50da7bb4d102 Mon Sep 17 00:00:00 2001 From: Eirik Schwenke Date: Sun, 22 Mar 2015 08:48:05 +0100 Subject: [PATCH 1/3] Apparently std::os::unix::osStrExt is now std::os::unix::ffi::OsStrExt. --- src/dir.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dir.rs b/src/dir.rs index 77be8ff..f6b5445 100644 --- a/src/dir.rs +++ b/src/dir.rs @@ -84,7 +84,7 @@ impl Git { /// Discover a Git repository on or above this directory, scanning it for /// the files' statuses if one is found. fn scan(path: &Path) -> Result { - use std::os::unix::OsStrExt; + use std::os::unix::ffi::OsStrExt; use std::ffi::AsOsStr; // TODO: libgit2-rs uses the new Path module, but exa still uses the From 8b2a19046e020d45ae808a3271706970ae8c182d Mon Sep 17 00:00:00 2001 From: Eirik Schwenke Date: Sun, 22 Mar 2015 08:50:15 +0100 Subject: [PATCH 2/3] The path_filename function/method isn't declared public. If the declaration is changed, rustc complains about a conflict. This seems to be the minimal change needed for tests to run. --- src/file.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file.rs b/src/file.rs index a8a72f6..9d4f6da 100644 --- a/src/file.rs +++ b/src/file.rs @@ -490,7 +490,7 @@ fn ext<'a>(name: &'a str) -> Option { #[cfg(test)] pub mod test { pub use super::*; - pub use super::path_filename; + use super::path_filename; pub use column::{Cell, Column}; pub use std::old_io as io; From e6fa6c5b92173761a95a2680ea93dbaa740ffc11 Mon Sep 17 00:00:00 2001 From: Ben S Date: Sun, 22 Mar 2015 12:05:29 +0000 Subject: [PATCH 3/3] Versions bump --- Cargo.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e11a53e..25616da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,7 +6,7 @@ dependencies = [ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "datetime 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.2.3 (git+https://github.com/alexcrichton/git2-rs.git)", + "git2 0.2.5 (git+https://github.com/alexcrichton/git2-rs.git)", "locale 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "natord 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "number_prefix 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -37,7 +37,7 @@ dependencies = [ [[package]] name = "gcc" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -50,13 +50,13 @@ dependencies = [ [[package]] name = "git2" -version = "0.2.3" -source = "git+https://github.com/alexcrichton/git2-rs.git#9e66217ea7f44546bcf95ec4a88782c87d7675f2" +version = "0.2.5" +source = "git+https://github.com/alexcrichton/git2-rs.git#bf37458739b5470e9cbee2001f595de302533d51" dependencies = [ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.2.4 (git+https://github.com/alexcrichton/git2-rs.git)", - "url 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.2.5 (git+https://github.com/alexcrichton/git2-rs.git)", + "url 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -66,11 +66,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libgit2-sys" -version = "0.2.4" -source = "git+https://github.com/alexcrichton/git2-rs.git#9e66217ea7f44546bcf95ec4a88782c87d7675f2" +version = "0.2.5" +source = "git+https://github.com/alexcrichton/git2-rs.git#bf37458739b5470e9cbee2001f595de302533d51" dependencies = [ "libc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libssh2-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -86,7 +86,7 @@ dependencies = [ [[package]] name = "libssh2-sys" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -133,7 +133,7 @@ name = "openssl-sys" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -169,16 +169,16 @@ dependencies = [ [[package]] name = "rustc-serialize" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "url" -version = "0.2.26" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]]