Merge branch 'next' into next-polkadot-sdk

patches/ciphersuite/Cargo.toml

@@ -12,8 +12,7 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lints]
-workspace = true
+[workspace]
 
 [dependencies]
 std-shims = { path = "../../common/std-shims", version = "0.1.4", default-features = false, optional = true }

patches/darling/Cargo.toml

@@ -12,5 +12,7 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [dependencies]
 darling = { version = "0.21" }

patches/directories-next/Cargo.toml

@@ -12,5 +12,7 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [dependencies]
 directories = "6"

patches/ethereum/ark-ff-0.3/Cargo.toml

@@ -12,5 +12,7 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [features]
 std = []

patches/ethereum/ark-ff-0.4/Cargo.toml

@@ -12,5 +12,7 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [features]
 std = []

patches/ethereum/c-kzg/Cargo.toml

@@ -12,6 +12,8 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [features]
 std = []
 serde = []

patches/ethereum/libsecp256k1/Cargo.toml

@@ -12,6 +12,8 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [features]
 std = []
 static-context = []

patches/ethereum/rug/Cargo.toml

@@ -12,6 +12,8 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [features]
 std = []
 integer = []

patches/ethereum/secp256k1-30/Cargo.toml

@@ -12,6 +12,8 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [features]
 alloc = []
 std = []

patches/ethereum/secp256k1-31/Cargo.toml

@@ -12,6 +12,8 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [features]
 alloc = []
 std = []

patches/is_terminal_polyfill/Cargo.toml

@@ -12,3 +12,5 @@ rust-version = "1.70"
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
+
+[workspace]

patches/option-ext/Cargo.toml

@@ -11,3 +11,5 @@ edition = "2021"
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
+
+[workspace]

patches/simple-request/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "simple-request"
-version = "0.1.99"
+version = "0.2.99"
 description = "simple-request which patches to the latest update"
 license = "MIT"
 repository = "https://github.com/serai-dex/serai/tree/develop/patches/simple-request"
@@ -13,11 +13,11 @@ rust-version = "1.65"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lints]
-workspace = true
+[workspace]
 
 [dependencies]
-simple-request = { path = "../../common/request" }
+hyper-util = { version = "0.1", default-features = false, features = ["tokio"] }
+simple-request = { path = "../../common/request", features = ["tokio"] }
 
 [features]
 tls = ["simple-request/tls"]

patches/simple-request/src/lib.rs

@@ -1,7 +1,10 @@
-pub use simple_request::{hyper, Error, Request, Response};
+use hyper_util::rt::tokio::TokioExecutor;
+pub use simple_request::{hyper, Error, Request};
 
 #[derive(Clone, Debug)]
-pub struct Client(simple_request::Client);
+pub struct Client(simple_request::Client<TokioExecutor>);
+
+pub type Response<'a> = simple_request::Response<'a, TokioExecutor>;
 
 impl Client {
   pub fn with_connection_pool() -> Client {

patches/std-shims/Cargo.toml

@@ -13,8 +13,7 @@ rust-version = "1.65"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lints]
-workspace = true
+[workspace]
 
 [dependencies]
 std-shims = { path = "../../common/std-shims", default-features = false, features = ["alloc"] }

patches/thiserror/Cargo.toml

@@ -12,5 +12,7 @@ edition = "2021"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace]
+
 [dependencies]
 thiserror = { version = "2", features = ["std"] }