From b59a99111c1206cb7484c5dee6cc29d638c5b8ba Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2019 21:46:38 -0700 Subject: [PATCH] Bump url from 1.7.2 to 2.0.0 (#5247) * Bump url from 1.7.2 to 2.0.0 Bumps [url](https://github.com/servo/rust-url) from 1.7.2 to 2.0.0. - [Release notes](https://github.com/servo/rust-url/releases) - [Commits](https://github.com/servo/rust-url/compare/v1.7.2...v2.0.0) Signed-off-by: dependabot-preview[bot] * Adapt to url 2.0.0 --- Cargo.lock | 34 +++++++++++++++++++++++++++++++--- install/Cargo.toml | 2 +- install/src/command.rs | 2 +- validator-info/Cargo.toml | 2 +- wallet/Cargo.toml | 2 +- 5 files changed, 35 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9a244b306..db07dfbcf1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1086,6 +1086,16 @@ dependencies = [ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "idna" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "indexmap" version = "1.0.2" @@ -1683,6 +1693,11 @@ name = "percent-encoding" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "percent-encoding" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "phf" version = "0.7.24" @@ -2686,7 +2701,7 @@ dependencies = [ "solana-sdk 0.17.0", "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "winreg 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3013,7 +3028,7 @@ dependencies = [ "solana-client 0.17.0", "solana-config-api 0.17.0", "solana-sdk 0.17.0", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3080,7 +3095,7 @@ dependencies = [ "solana-storage-api 0.17.0", "solana-vote-api 0.17.0", "solana-vote-signer 0.17.0", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3536,6 +3551,16 @@ dependencies = [ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "url" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "percent-encoding 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "utf8-ranges" version = "1.0.3" @@ -3829,6 +3854,7 @@ dependencies = [ "checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" "checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" "checksum indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2c60da1c9abea75996b70a931bba6c750730399005b61ccd853cee50ef3d0d0c" "checksum influx_db_client 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1af8df5705f0b30bcb504bafc9396d995a555c4d6bd6f9097729ad47b8a49a38" @@ -3894,6 +3920,7 @@ dependencies = [ "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +"checksum percent-encoding 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba4f28a6faf4ffea762ba8f4baef48c61a6db348647c73095034041fc79dd954" "checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" @@ -4016,6 +4043,7 @@ dependencies = [ "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece" "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +"checksum url 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "77ddaf52e65c6b81c56b7e957c0b1970f7937f21c5c6774c4e56fcb4e20b48c6" "checksum utf8-ranges 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9d50aa7650df78abf942826607c62468ce18d9019673d4a2ebe1865dbb96ffde" "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" "checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" diff --git a/install/Cargo.toml b/install/Cargo.toml index b3094906ac..dc03403149 100644 --- a/install/Cargo.toml +++ b/install/Cargo.toml @@ -38,7 +38,7 @@ solana-logger = { path = "../logger", version = "0.17.0" } solana-sdk = { path = "../sdk", version = "0.17.0" } tar = "0.4.26" tempdir = "0.3.7" -url = "1.7.2" +url = "2.0.0" [target."cfg(windows)".dependencies] winapi = "0.3.7" diff --git a/install/src/command.rs b/install/src/command.rs index eb140d4200..a253e508f0 100644 --- a/install/src/command.rs +++ b/install/src/command.rs @@ -78,7 +78,7 @@ fn download_to_temp_archive( let progress_bar = new_spinner_progress_bar(); progress_bar.set_message(&format!("{}Downloading...", TRUCK)); - let response = client.get(url).send()?; + let response = client.get(url.as_str()).send()?; let download_size = { response .headers() diff --git a/validator-info/Cargo.toml b/validator-info/Cargo.toml index 13e2f60fc8..138565431a 100644 --- a/validator-info/Cargo.toml +++ b/validator-info/Cargo.toml @@ -23,7 +23,7 @@ serde_json = "1.0.40" solana-client = { path = "../client", version = "0.17.0" } solana-config-api = { path = "../programs/config_api", version = "0.17.0" } solana-sdk = { path = "../sdk", version = "0.17.0" } -url = "1.7.2" +url = "2.0.0" [[bin]] name = "solana-validator-info" diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml index b25ec54394..bf50a56fc8 100644 --- a/wallet/Cargo.toml +++ b/wallet/Cargo.toml @@ -28,7 +28,7 @@ solana-stake-api = { path = "../programs/stake_api", version = "0.17.0" } solana-storage-api = { path = "../programs/storage_api", version = "0.17.0" } solana-vote-api = { path = "../programs/vote_api", version = "0.17.0" } solana-vote-signer = { path = "../vote-signer", version = "0.17.0" } -url = "1.7.2" +url = "2.0.0" [dev-dependencies] solana = { path = "../core", version = "0.17.0" }