From b90bb7d6a8e410a2ba631bc2a1f3f40b1f5aaf9c Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 12 Feb 2018 12:42:31 -0800 Subject: [PATCH] Update dependencies Just a few major updates here and there --- Cargo.toml | 6 +++--- tests/cargotest/Cargo.toml | 2 +- tests/cargotest/support/registry.rs | 4 ++-- tests/package.rs | 6 +----- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 265a0ad15..237890cfc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ git2-curl = "0.7" glob = "0.2" hex = "0.3" home = "0.3" -ignore = "0.3" +ignore = "0.4" jobserver = "0.1.9" libc = "0.2" libgit2-sys = "0.6" @@ -54,10 +54,10 @@ toml = "0.4" url = "1.1" [target.'cfg(target_os = "macos")'.dependencies] -core-foundation = { version = "0.4.4", features = ["mac_os_10_7_support"] } +core-foundation = { version = "0.5.1", features = ["mac_os_10_7_support"] } [target.'cfg(windows)'.dependencies] -miow = "0.2" +miow = "0.3" [target.'cfg(windows)'.dependencies.winapi] version = "0.3" diff --git a/tests/cargotest/Cargo.toml b/tests/cargotest/Cargo.toml index 5f1b6a498..ee9770a38 100644 --- a/tests/cargotest/Cargo.toml +++ b/tests/cargotest/Cargo.toml @@ -12,7 +12,7 @@ filetime = "0.1" flate2 = "1.0" git2 = { version = "0.6", default-features = false } hamcrest = "=0.1.1" -hex = "0.2" +hex = "0.3" log = "0.4" serde_json = "1.0" tar = { version = "0.4", default-features = false } diff --git a/tests/cargotest/support/registry.rs b/tests/cargotest/support/registry.rs index 25f8feb14..7283ad78a 100644 --- a/tests/cargotest/support/registry.rs +++ b/tests/cargotest/support/registry.rs @@ -6,7 +6,7 @@ use std::path::{PathBuf, Path}; use flate2::Compression; use flate2::write::GzEncoder; use git2; -use hex::ToHex; +use hex; use tar::{Builder, Header}; use url::Url; @@ -320,5 +320,5 @@ impl Package { pub fn cksum(s: &[u8]) -> String { let mut sha = Sha256::new(); sha.update(s); - sha.finish().to_hex() + hex::encode(&sha.finish()) } diff --git a/tests/package.rs b/tests/package.rs index f49a56193..ca35e624b 100644 --- a/tests/package.rs +++ b/tests/package.rs @@ -330,10 +330,6 @@ See [..] See [..] [WARNING] [..] file `some_dir[/]dir_deep_3[/]some_dir[/]file` WILL be excluded [..] See [..] -[WARNING] [..] file `some_dir[/]dir_deep_4[/]some_dir[/]file` WILL be excluded [..] -See [..] -[WARNING] [..] file `some_dir[/]dir_deep_5[/]some_dir[/]file` WILL be excluded [..] -See [..] [WARNING] [..] file `some_dir[/]file_deep_1` WILL be excluded [..] See [..] [ARCHIVING] [..] @@ -1003,4 +999,4 @@ Caused by: consider adding `cargo-features = [\"epoch\"]` to the manifest "))); -} \ No newline at end of file +} -- 2.39.5