From cf418953684dd9ab286857d457689117095bad82 Mon Sep 17 00:00:00 2001 From: David Teresi Date: Mon, 1 Apr 2024 20:55:29 -0400 Subject: [PATCH 1/3] Add option to disable default features for `zip` --- Cargo.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 913c1fa..eaf545f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,8 +8,9 @@ license = "MIT" edition = "2018" [features] -default = ["read-url"] +default = ["read-url", "zip-full"] read-url = ["reqwest", "futures"] +zip-full = ["zip/default"] [dependencies] bytes = "1" @@ -20,12 +21,12 @@ serde_derive = "1.0" chrono = "0.4" itertools = "0.11" sha2 = "0.10" -zip = "0.6" thiserror = "1" rgb = "0.8" futures = { version = "0.3", optional = true } reqwest = { version = "0.11", optional = true, features = ["blocking"]} +zip = { version = "0.6", default-features = false, features = [ "deflate" ] } [dev-dependencies] serde_json = "1.0" From 58e36f695a1e82c70bed9ea4bbe93d2e3325a2e9 Mon Sep 17 00:00:00 2001 From: David Teresi Date: Tue, 2 Apr 2024 11:28:29 -0400 Subject: [PATCH 2/3] Add option to disable default features for reqwest --- Cargo.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index eaf545f..8b3c50a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,9 +8,10 @@ license = "MIT" edition = "2018" [features] -default = ["read-url", "zip-full"] +default = ["read-url", "zip-full", "reqwest-full"] read-url = ["reqwest", "futures"] zip-full = ["zip/default"] +reqwest-full = ["reqwest/default"] [dependencies] bytes = "1" @@ -25,8 +26,8 @@ thiserror = "1" rgb = "0.8" futures = { version = "0.3", optional = true } -reqwest = { version = "0.11", optional = true, features = ["blocking"]} -zip = { version = "0.6", default-features = false, features = [ "deflate" ] } +reqwest = { version = "0.11", optional = true, default-features = false, features = ["blocking", "rustls-tls"]} +zip = { version = "0.6", default-features = false, features = ["deflate"] } [dev-dependencies] serde_json = "1.0" From d869477894ab256d53ce90d7ae9af550c0c7bfeb Mon Sep 17 00:00:00 2001 From: David Teresi Date: Tue, 2 Apr 2024 11:49:29 -0400 Subject: [PATCH 3/3] specify rustls-tls separately from default --- Cargo.toml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8b3c50a..78a8cb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,10 +8,11 @@ license = "MIT" edition = "2018" [features] -default = ["read-url", "zip-full", "reqwest-full"] +default = ["read-url", "zip-default", "reqwest-default"] read-url = ["reqwest", "futures"] -zip-full = ["zip/default"] -reqwest-full = ["reqwest/default"] +zip-default = ["zip/default"] +reqwest-default = ["reqwest/default"] +reqwest-rustls-tls = ["reqwest/rustls-tls"] [dependencies] bytes = "1" @@ -26,7 +27,7 @@ thiserror = "1" rgb = "0.8" futures = { version = "0.3", optional = true } -reqwest = { version = "0.11", optional = true, default-features = false, features = ["blocking", "rustls-tls"]} +reqwest = { version = "0.11", optional = true, default-features = false, features = ["blocking"]} zip = { version = "0.6", default-features = false, features = ["deflate"] } [dev-dependencies]