From f757300718b1861852d4a33459385eaf921d69e7 Mon Sep 17 00:00:00 2001 From: Benjamin Sago Date: Sun, 11 Mar 2018 11:25:06 +0000 Subject: [PATCH] Upgrade libgit2 The ogham/git2-rs repository that exa uses in the Vagrant VM has also been updated. The only casualty was that some constants got namespaced. --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- src/fs/feature/git.rs | 24 ++++++++++++------------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4633bc9..60eb181 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,7 +13,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bitflags" -version = "0.9.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -70,7 +70,7 @@ dependencies = [ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "datetime 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "git2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", @@ -89,12 +89,12 @@ dependencies = [ [[package]] name = "git2" -version = "0.6.11" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -142,7 +142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libgit2-sys" -version = "0.6.19" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -400,21 +400,21 @@ dependencies = [ [metadata] "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4" "checksum ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455" -"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" +"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf" "checksum byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96c8b41881888cc08af32d47ac4edd52bc7fa27fef774be47a92443756451304" "checksum cc 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fedf677519ac9e865c4ff43ef8f930773b37ed6e6ea61b6b83b400a7b5787f49" "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" "checksum cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "56d741ea7a69e577f6d06b36b7dff4738f680593dc27a701ffa8506b73ce28bb" "checksum datetime 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5c44b6c112860e38412e0c4732172d723458d40db906ee4b9ce87544f022a7b9" "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b" -"checksum git2 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ee5b4bb7cd2a44e6e5ee3a26ba6a9ca10d4ce2771cdc3839bbc54b47b7d1be84" +"checksum git2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4813cd7ad02e53275e6e51aaaf21c30f9ef500b579ad7a54a92f6091a7ac296" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d" "checksum iso8601 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "11dc464f8c6f17595d191447c9c6559298b2d023d6f846a4a23ac7ea3c46c477" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d" "checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff" -"checksum libgit2-sys 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "6eeae66e7b1c995de45cb4e65c5ab438a96a7b4077e448645d4048dc753ad357" +"checksum libgit2-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1ecbd6428006c321c29b6c8a895f0d90152f1cf4fd8faab69fc436a3d9594f63" "checksum libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16" "checksum locale 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fdbe492a9c0238da900a1165c42fc5067161ce292678a6fe80921f30fe307fd" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" diff --git a/Cargo.toml b/Cargo.toml index e9564d7..644fcd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,6 +58,6 @@ lto = true panic = "abort" [dependencies.git2] -version = "0.6.4" +version = "0.7" optional = true default-features = false diff --git a/src/fs/feature/git.rs b/src/fs/feature/git.rs index 6ecf8e9..9cc1b7f 100644 --- a/src/fs/feature/git.rs +++ b/src/fs/feature/git.rs @@ -274,12 +274,12 @@ fn reorient(path: &Path) -> PathBuf { /// The character to display if the file has been modified, but not staged. fn working_tree_status(status: git2::Status) -> f::GitStatus { match status { - s if s.contains(git2::STATUS_WT_NEW) => f::GitStatus::New, - s if s.contains(git2::STATUS_WT_MODIFIED) => f::GitStatus::Modified, - s if s.contains(git2::STATUS_WT_DELETED) => f::GitStatus::Deleted, - s if s.contains(git2::STATUS_WT_RENAMED) => f::GitStatus::Renamed, - s if s.contains(git2::STATUS_WT_TYPECHANGE) => f::GitStatus::TypeChange, - _ => f::GitStatus::NotModified, + s if s.contains(git2::Status::WT_NEW) => f::GitStatus::New, + s if s.contains(git2::Status::WT_MODIFIED) => f::GitStatus::Modified, + s if s.contains(git2::Status::WT_DELETED) => f::GitStatus::Deleted, + s if s.contains(git2::Status::WT_RENAMED) => f::GitStatus::Renamed, + s if s.contains(git2::Status::WT_TYPECHANGE) => f::GitStatus::TypeChange, + _ => f::GitStatus::NotModified, } } @@ -287,11 +287,11 @@ fn working_tree_status(status: git2::Status) -> f::GitStatus { /// has been staged. fn index_status(status: git2::Status) -> f::GitStatus { match status { - s if s.contains(git2::STATUS_INDEX_NEW) => f::GitStatus::New, - s if s.contains(git2::STATUS_INDEX_MODIFIED) => f::GitStatus::Modified, - s if s.contains(git2::STATUS_INDEX_DELETED) => f::GitStatus::Deleted, - s if s.contains(git2::STATUS_INDEX_RENAMED) => f::GitStatus::Renamed, - s if s.contains(git2::STATUS_INDEX_TYPECHANGE) => f::GitStatus::TypeChange, - _ => f::GitStatus::NotModified, + s if s.contains(git2::Status::INDEX_NEW) => f::GitStatus::New, + s if s.contains(git2::Status::INDEX_MODIFIED) => f::GitStatus::Modified, + s if s.contains(git2::Status::INDEX_DELETED) => f::GitStatus::Deleted, + s if s.contains(git2::Status::INDEX_RENAMED) => f::GitStatus::Renamed, + s if s.contains(git2::Status::INDEX_TYPECHANGE) => f::GitStatus::TypeChange, + _ => f::GitStatus::NotModified, } }