Skip to content

Commit 65e647c

Browse files
committed
Auto merge of #58131 - ehuss:update-cargo, r=alexcrichton
Update cargo 7 commits in 245818076052dd7178f5bb7585f5aec5b6c1e03e..4e74e2fc0908524d17735c768067117d3e84ee9c 2019-01-27 15:17:26 +0000 to 2019-02-02 17:48:44 +0000 - Fix overlapping progress with stdout. (rust-lang/cargo#6618) - Improve progress bar flickering. (rust-lang/cargo#6615) - Add detail to multiple rename deps (rust-lang/cargo#6603) - Fix race condition in local registry crate unpacking (rust-lang/cargo#6591) - Revert "Make incremental compilation the default for all profiles." (rust-lang/cargo#6610) - Fixup the docs on crate-type (rust-lang/cargo#6606) - Document that owner --add now just invites (rust-lang/cargo#6604)
2 parents 4b1e39b + 55917ba commit 65e647c

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Cargo.lock

+15-15
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ dependencies = [
7575
"colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
7676
"difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
7777
"environment 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
78-
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
79-
"failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
78+
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
79+
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
8080
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
8181
]
8282

@@ -237,7 +237,7 @@ dependencies = [
237237
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
238238
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
239239
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
240-
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
240+
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
241241
"filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
242242
"flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
243243
"fs2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -530,7 +530,7 @@ name = "crates-io"
530530
version = "0.23.0"
531531
dependencies = [
532532
"curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
533-
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
533+
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
534534
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
535535
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
536536
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -841,16 +841,16 @@ dependencies = [
841841

842842
[[package]]
843843
name = "failure"
844-
version = "0.1.3"
844+
version = "0.1.5"
845845
source = "registry+https://github.com/rust-lang/crates.io-index"
846846
dependencies = [
847847
"backtrace 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
848-
"failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
848+
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
849849
]
850850

851851
[[package]]
852852
name = "failure_derive"
853-
version = "0.1.3"
853+
version = "0.1.5"
854854
source = "registry+https://github.com/rust-lang/crates.io-index"
855855
dependencies = [
856856
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1677,8 +1677,8 @@ name = "opener"
16771677
version = "0.3.2"
16781678
source = "registry+https://github.com/rust-lang/crates.io-index"
16791679
dependencies = [
1680-
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
1681-
"failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
1680+
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
1681+
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
16821682
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
16831683
]
16841684

@@ -2254,7 +2254,7 @@ dependencies = [
22542254
"crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
22552255
"difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
22562256
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
2257-
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
2257+
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
22582258
"futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
22592259
"home 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
22602260
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3014,7 +3014,7 @@ name = "rustfix"
30143014
version = "0.4.4"
30153015
source = "registry+https://github.com/rust-lang/crates.io-index"
30163016
dependencies = [
3017-
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
3017+
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
30183018
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
30193019
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
30203020
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3032,7 +3032,7 @@ dependencies = [
30323032
"derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
30333033
"diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
30343034
"env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
3035-
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
3035+
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
30363036
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
30373037
"itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
30383038
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3818,7 +3818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
38183818
dependencies = [
38193819
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
38203820
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
3821-
"failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
3821+
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
38223822
]
38233823

38243824
[[package]]
@@ -3997,8 +3997,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
39973997
"checksum environment 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee"
39983998
"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
39993999
"checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
4000-
"checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7"
4001-
"checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596"
4000+
"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
4001+
"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
40024002
"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
40034003
"checksum filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a2df5c1a8c4be27e7707789dc42ae65976e60b394afd293d1419ab915833e646"
40044004
"checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"

0 commit comments

Comments
 (0)