From 08ec11d23d7bd4902c3a6f9f22b174bf44f00aed Mon Sep 17 00:00:00 2001 From: Martin Algesten Date: Wed, 27 Nov 2024 08:57:46 +0100 Subject: [PATCH] Lock version for MSRV 1.63 --- Cargo.lock | 71 +++++++++++++++++++++++++----------------------------- Cargo.toml | 15 +++++++++--- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e83a7535..da98d5f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,6 +23,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "allocator-api2" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" + [[package]] name = "base64" version = "0.22.1" @@ -78,7 +84,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ - "percent-encoding 2.3.1", + "percent-encoding", "time", "version_check", ] @@ -95,7 +101,7 @@ dependencies = [ "indexmap", "log", "time", - "url 2.5.3", + "url", ] [[package]] @@ -189,6 +195,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -210,7 +222,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "percent-encoding 2.3.1", + "percent-encoding", ] [[package]] @@ -226,9 +238,14 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "hoot" @@ -289,11 +306,10 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "idna" -version = "0.1.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -369,12 +385,6 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "memchr" version = "2.7.4" @@ -457,12 +467,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -605,9 +609,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -810,6 +814,7 @@ dependencies = [ "encoding_rs", "env_logger", "flate2", + "hashbrown", "hootbin", "http 0.2.12", "http 1.1.0", @@ -821,34 +826,24 @@ dependencies = [ "rustls-native-certs", "rustls-pemfile", "rustls-pki-types", + "security-framework-sys", "serde", "serde_json", "socks", "time", - "url 1.7.2", + "url", "webpki-roots", ] [[package]] name = "url" -version = "1.7.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - -[[package]] -name = "url" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 1.0.3", - "percent-encoding 2.3.1", + "idna 0.5.0", + "percent-encoding", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d91d3f32..74602348 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,8 @@ features = ["tls", "native-tls", "json", "charset", "cookies", "socks-proxy", "g rustdoc-args = ["--cfg", "docsrs"] [features] -default = ["tls", "gzip"] +# default = ["tls", "gzip"] +default = ["tls", "native-tls", "json", "charset", "cookies", "socks-proxy", "gzip", "brotli", "http-interop", "http-crate"] tls = ["dep:webpki-roots", "dep:rustls", "dep:rustls-pki-types"] native-certs = ["dep:rustls-native-certs"] native-tls = ["dep:native-tls"] @@ -47,7 +48,7 @@ socks = { version = "0.3", optional = true } serde = { version = "1", optional = true } serde_json = { version = ">=1.0.97", optional = true } encoding_rs = { version = "0.8", optional = true } -cookie_store = { version = "0.21", optional = true, default-features = false, features = ["preserve_order"] } +cookie_store = { version = "0.21.1", optional = true, default-features = false, features = ["preserve_order"] } log = "0.4" webpki-roots = { version = "0.26", optional = true } rustls = { version = "0.23.5", optional = true, default-features = false, features = ["ring", "logging", "std", "tls12"] } @@ -69,10 +70,16 @@ time = "=0.3.20" # Locked down because the url project bumped their MSRV in a patch version(!) # No problem: https://github.com/algesten/ureq/issues/877 -url = "<=2.5.0" +url = "=2.5.0" # The MSRV fun continues: https://github.com/servo/rust-url/issues/939 -idna_adapter = "<=1.1" +idna_adapter = "=1.1" + +# Locked for MSRV +hashbrown = { version = "=0.15.0", optional = false } + +# Locked for MSRV +security-framework-sys = "=2.11.1" [dev-dependencies] env_logger = { version = "<=0.9", default-features = false, features = ["humantime"] }