Skip to content

Commit 2d42bcf

Browse files
committed
Auto merge of #5033 - alexcrichton:update-deps, r=matklad
Update dependencies Just a few major updates here and there
2 parents 3d0d90f + b90bb7d commit 2d42bcf

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ git2-curl = "0.7"
3333
glob = "0.2"
3434
hex = "0.3"
3535
home = "0.3"
36-
ignore = "0.3"
36+
ignore = "0.4"
3737
jobserver = "0.1.9"
3838
lazycell = "0.6"
3939
libc = "0.2"
@@ -55,10 +55,10 @@ toml = "0.4"
5555
url = "1.1"
5656

5757
[target.'cfg(target_os = "macos")'.dependencies]
58-
core-foundation = { version = "0.4.4", features = ["mac_os_10_7_support"] }
58+
core-foundation = { version = "0.5.1", features = ["mac_os_10_7_support"] }
5959

6060
[target.'cfg(windows)'.dependencies]
61-
miow = "0.2"
61+
miow = "0.3"
6262

6363
[target.'cfg(windows)'.dependencies.winapi]
6464
version = "0.3"

tests/cargotest/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ filetime = "0.1"
1212
flate2 = "1.0"
1313
git2 = { version = "0.6", default-features = false }
1414
hamcrest = "=0.1.1"
15-
hex = "0.2"
15+
hex = "0.3"
1616
log = "0.4"
1717
serde_json = "1.0"
1818
tar = { version = "0.4", default-features = false }

tests/cargotest/support/registry.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::path::{PathBuf, Path};
66
use flate2::Compression;
77
use flate2::write::GzEncoder;
88
use git2;
9-
use hex::ToHex;
9+
use hex;
1010
use tar::{Builder, Header};
1111
use url::Url;
1212

@@ -320,5 +320,5 @@ impl Package {
320320
pub fn cksum(s: &[u8]) -> String {
321321
let mut sha = Sha256::new();
322322
sha.update(s);
323-
sha.finish().to_hex()
323+
hex::encode(&sha.finish())
324324
}

tests/package.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,6 @@ See [..]
330330
See [..]
331331
[WARNING] [..] file `some_dir[/]dir_deep_3[/]some_dir[/]file` WILL be excluded [..]
332332
See [..]
333-
[WARNING] [..] file `some_dir[/]dir_deep_4[/]some_dir[/]file` WILL be excluded [..]
334-
See [..]
335-
[WARNING] [..] file `some_dir[/]dir_deep_5[/]some_dir[/]file` WILL be excluded [..]
336-
See [..]
337333
[WARNING] [..] file `some_dir[/]file_deep_1` WILL be excluded [..]
338334
See [..]
339335
[ARCHIVING] [..]
@@ -1003,4 +999,4 @@ Caused by:
1003999
10041000
consider adding `cargo-features = [\"epoch\"]` to the manifest
10051001
")));
1006-
}
1002+
}

0 commit comments

Comments
 (0)