cargo-download: Fix build by bumping url from 1.6.0 to 1.6.1

url 1.6.0 no longer builds with Rust 1.40 and later due to a lifetime
bug uncovered by NLL: https://github.com/Xion/cargo-download/pull/7

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2021-01-02 19:49:39 -08:00
parent 733e537a8a
commit 74a8ac4648
2 changed files with 27 additions and 27 deletions

View file

@ -427,7 +427,7 @@ rec {
serde_urlencoded = "0.5.1"; serde_urlencoded = "0.5.1";
tokio = "0.1.7"; tokio = "0.1.7";
tokio_io = "0.1.10"; tokio_io = "0.1.10";
url = "1.6.0"; url = "1.6.1";
uuid = "0.7.1"; uuid = "0.7.1";
}; };
deps.rustc_version."0.2.3" = { deps.rustc_version."0.2.3" = {
@ -464,7 +464,7 @@ rec {
dtoa = "0.4.2"; dtoa = "0.4.2";
itoa = "0.3.4"; itoa = "0.3.4";
serde = "1.0.21"; serde = "1.0.21";
url = "1.6.0"; url = "1.6.1";
}; };
deps.siphasher."0.2.2" = {}; deps.siphasher."0.2.2" = {};
deps.slab."0.4.0" = {}; deps.slab."0.4.0" = {};
@ -639,7 +639,7 @@ rec {
deps.unreachable."1.0.0" = { deps.unreachable."1.0.0" = {
void = "1.0.2"; void = "1.0.2";
}; };
deps.url."1.6.0" = { deps.url."1.6.1" = {
idna = "0.1.4"; idna = "0.1.4";
matches = "0.1.6"; matches = "0.1.6";
percent_encoding = "1.0.1"; percent_encoding = "1.0.1";

View file

@ -4926,40 +4926,40 @@ rec {
# end # end
# url-1.6.0 # url-1.6.1
crates.url."1.6.0" = deps: { features?(features_.url."1.6.0" deps {}) }: buildRustCrate { crates.url."1.6.1" = deps: { features?(features_.url."1.6.1" deps {}) }: buildRustCrate {
crateName = "url"; crateName = "url";
version = "1.6.0"; version = "1.6.1";
description = "URL library for Rust, based on the WHATWG URL Standard"; description = "URL library for Rust, based on the WHATWG URL Standard";
authors = [ "The rust-url developers" ]; authors = [ "The rust-url developers" ];
sha256 = "1bvzl4dvjj84h46ai3x23wyafa2wwhchj08vr2brf25dxwc7mg18"; sha256 = "1qsnhmxznzaxl068a3ksz69kwcz7ghvl4zflg9qj7lyw4bk9ma38";
dependencies = mapFeatures features ([ dependencies = mapFeatures features ([
(crates."idna"."${deps."url"."1.6.0"."idna"}" deps) (crates."idna"."${deps."url"."1.6.1"."idna"}" deps)
(crates."matches"."${deps."url"."1.6.0"."matches"}" deps) (crates."matches"."${deps."url"."1.6.1"."matches"}" deps)
(crates."percent_encoding"."${deps."url"."1.6.0"."percent_encoding"}" deps) (crates."percent_encoding"."${deps."url"."1.6.1"."percent_encoding"}" deps)
]); ]);
features = mkFeatures (features."url"."1.6.0" or {}); features = mkFeatures (features."url"."1.6.1" or {});
}; };
features_.url."1.6.0" = deps: f: updateFeatures f (rec { features_.url."1.6.1" = deps: f: updateFeatures f (rec {
idna."${deps.url."1.6.0".idna}".default = true; idna."${deps.url."1.6.1".idna}".default = true;
matches."${deps.url."1.6.0".matches}".default = true; matches."${deps.url."1.6.1".matches}".default = true;
percent_encoding."${deps.url."1.6.0".percent_encoding}".default = true; percent_encoding."${deps.url."1.6.1".percent_encoding}".default = true;
url = fold recursiveUpdate {} [ url = fold recursiveUpdate {} [
{ "1.6.0"."encoding" = { "1.6.1"."encoding" =
(f.url."1.6.0"."encoding" or false) || (f.url."1.6.1"."encoding" or false) ||
(f.url."1.6.0".query_encoding or false) || (f.url."1.6.1".query_encoding or false) ||
(url."1.6.0"."query_encoding" or false); } (url."1.6.1"."query_encoding" or false); }
{ "1.6.0"."heapsize" = { "1.6.1"."heapsize" =
(f.url."1.6.0"."heapsize" or false) || (f.url."1.6.1"."heapsize" or false) ||
(f.url."1.6.0".heap_size or false) || (f.url."1.6.1".heap_size or false) ||
(url."1.6.0"."heap_size" or false); } (url."1.6.1"."heap_size" or false); }
{ "1.6.0".default = (f.url."1.6.0".default or true); } { "1.6.1".default = (f.url."1.6.1".default or true); }
]; ];
}) [ }) [
(features_.idna."${deps."url"."1.6.0"."idna"}" deps) (features_.idna."${deps."url"."1.6.1"."idna"}" deps)
(features_.matches."${deps."url"."1.6.0"."matches"}" deps) (features_.matches."${deps."url"."1.6.1"."matches"}" deps)
(features_.percent_encoding."${deps."url"."1.6.0"."percent_encoding"}" deps) (features_.percent_encoding."${deps."url"."1.6.1"."percent_encoding"}" deps)
]; ];