From 7092e278d757da6236b48bb8b9b839cb838502b1 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Thu, 15 Aug 2024 22:40:35 +0200 Subject: [PATCH 1/7] Relax constraint on version of reqwest dependency (Cargo will pick the latest patch that's possible, but not fail if another dep. has it pinned to something below patch 27) --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0ba4e9aa..328aadfd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ categories = ["command-line-utilities"] build = "build/main.rs" rust-version = "1.77" -[lib] +[lib]s crate-type = ["cdylib", "rlib"] [features] @@ -87,7 +87,7 @@ ctrlc = { version = "3.4.4", optional = true } hostname = { version = "0.4.0", optional = true } libffi = { version = "3.2.0", optional = true } native-tls = { version = "0.2.12", optional = true } -reqwest = { version = "0.11.27", optional = true } +reqwest = { version = "0.11.*", optional = true } rustyline = { version = "14.0.0", optional = true } tokio = { version = "1.39.2", features = ["full"] } warp = { version = "0.3.7", features = ["tls"], optional = true } From e0ec5e75b4c748fafd573e98bd52850579460b4b Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Thu, 15 Aug 2024 22:41:48 +0200 Subject: [PATCH 2/7] typo --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 328aadfd..ae1a6d00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ categories = ["command-line-utilities"] build = "build/main.rs" rust-version = "1.77" -[lib]s +[lib] crate-type = ["cdylib", "rlib"] [features] From 2faab30af968f9504aab969e737d7287ed184418 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Fri, 16 Aug 2024 16:15:10 +0200 Subject: [PATCH 3/7] Explanatory comment for the wildcard patch version --- Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index ae1a6d00..623aced1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,6 +87,8 @@ ctrlc = { version = "3.4.4", optional = true } hostname = { version = "0.4.0", optional = true } libffi = { version = "3.2.0", optional = true } native-tls = { version = "0.2.12", optional = true } +// allow dependent crates to pick the patch version that works with other +// dependencies, while also updating to latest when possible reqwest = { version = "0.11.*", optional = true } rustyline = { version = "14.0.0", optional = true } tokio = { version = "1.39.2", features = ["full"] } From 8925133f406581621dee30ca85dc2e193e7b2d60 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Fri, 16 Aug 2024 16:16:16 +0200 Subject: [PATCH 4/7] Explanatory comment for the wildcard patch version --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 623aced1..dda4e74c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,8 +87,8 @@ ctrlc = { version = "3.4.4", optional = true } hostname = { version = "0.4.0", optional = true } libffi = { version = "3.2.0", optional = true } native-tls = { version = "0.2.12", optional = true } -// allow dependent crates to pick the patch version that works with other -// dependencies, while also updating to latest when possible +# allow dependent crates to pick the patch version that works with other +# dependencies, while also updating to latest when possible reqwest = { version = "0.11.*", optional = true } rustyline = { version = "14.0.0", optional = true } tokio = { version = "1.39.2", features = ["full"] } From 6be671d7d967ed8f1347fe5387e9a7bde04ea895 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Tue, 20 Aug 2024 22:08:11 +0200 Subject: [PATCH 5/7] More precise comment mentioning Deno MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bennet Bleßmann --- Cargo.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index dda4e74c..d4c3ab7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,9 @@ libffi = { version = "3.2.0", optional = true } native-tls = { version = "0.2.12", optional = true } # allow dependent crates to pick the patch version that works with other # dependencies, while also updating to latest when possible -reqwest = { version = "0.11.*", optional = true } +# the version requirement of reqwest is kept low for compatibility with old deno versions +# that pin request to 0.11.20 +reqwest = { version = "0.11.0", optional = true } rustyline = { version = "14.0.0", optional = true } tokio = { version = "1.39.2", features = ["full"] } warp = { version = "0.3.7", features = ["tls"], optional = true } From e1d830d680ac9bb2c09f92a622496d77260f6c16 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Tue, 20 Aug 2024 22:09:32 +0200 Subject: [PATCH 6/7] Clean-up comment --- Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d4c3ab7b..2216ad0a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,8 +87,6 @@ ctrlc = { version = "3.4.4", optional = true } hostname = { version = "0.4.0", optional = true } libffi = { version = "3.2.0", optional = true } native-tls = { version = "0.2.12", optional = true } -# allow dependent crates to pick the patch version that works with other -# dependencies, while also updating to latest when possible # the version requirement of reqwest is kept low for compatibility with old deno versions # that pin request to 0.11.20 reqwest = { version = "0.11.0", optional = true } From 808ea9fc7958f1e2220b09341431ddb5e3810a34 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Thu, 22 Aug 2024 12:55:32 +0200 Subject: [PATCH 7/7] Fix spelling of reqWest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bennet Bleßmann --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2216ad0a..ddb6f239 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -88,7 +88,7 @@ hostname = { version = "0.4.0", optional = true } libffi = { version = "3.2.0", optional = true } native-tls = { version = "0.2.12", optional = true } # the version requirement of reqwest is kept low for compatibility with old deno versions -# that pin request to 0.11.20 +# that pin reqwest to 0.11.20 reqwest = { version = "0.11.0", optional = true } rustyline = { version = "14.0.0", optional = true } tokio = { version = "1.39.2", features = ["full"] }