Merge pull request #34 from stormshield-gt/bump-reqwest

bump reqwest to 0.13

Author: stormshield-gt

Cargo.toml

@@ -13,9 +13,11 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-default = ["reqwest/default-tls"]
+default = ["rustls"]
+rustls = ["reqwest/rustls"]
 blocking = ["reqwest/blocking"]
-rustls-tls = ["reqwest/rustls-tls"]
+native-tls = ["reqwest/native-tls"]
+rustls-no-provider = ["reqwest/rustls-no-provider"]
 
 [workspace]
 members = [
@@ -27,7 +29,7 @@ anyhow = "1.0.56"
 async-trait = "0.1.52"
 bytes = "1.1.0"
 http = "1"
-reqwest = { version = "0.12.2", default-features = false, optional = true }
+reqwest = { version = "0.13.0", default-features = false }
 rustify_derive = { version = "0.5.4", path = "rustify_derive" }
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"

src/blocking/clients.rs

@@ -1,4 +1,3 @@
 //! Contains implementations of [Client][crate::blocking::client::Client] which
 //! use varying blocking HTTP clients.
-#[cfg(feature = "reqwest")]
 pub mod reqwest;

src/clients.rs

@@ -1,4 +1,3 @@
 //! Contains implementations of [Client][crate::client::Client] which use
 //! varying HTTP clients.
-#[cfg(feature = "reqwest")]
 pub mod reqwest;

src/endpoint.rs

@@ -239,7 +239,7 @@ pub trait Endpoint: Send + Sync + Sized {
         Ok(EndpointResult::new(resp, Self::RESPONSE_BODY_TYPE))
     }
 
-    fn with_middleware<M: MiddleWare>(self, middleware: &M) -> MutatedEndpoint<Self, M> {
+    fn with_middleware<M: MiddleWare>(self, middleware: &M) -> MutatedEndpoint<'_, Self, M> {
         MutatedEndpoint::new(self, middleware)
     }
 

src/lib.rs

@@ -194,7 +194,7 @@
 //! The following features are available for this crate:
 //!
 //! * `blocking`: Enables the blocking variants of `Client`s as well as the blocking
-//!    `exec()` functions in `Endpoint`s.
+//!   `exec()` functions in `Endpoint`s.
 //!
 //! ## Error Handling
 //!

tests/macro/empty_attr.stderr

@@ -16,4 +16,4 @@ warning: unused import: `rustify::endpoint::Endpoint`
 1 | use rustify::endpoint::Endpoint;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
-  = note: `#[warn(unused_imports)]` on by default
+  = note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default

tests/macro/invalid_data.stderr

@@ -11,28 +11,27 @@ warning: unused import: `rustify::endpoint::Endpoint`
 1 | use rustify::endpoint::Endpoint;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
-  = note: `#[warn(unused_imports)]` on by default
+  = note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
 
 error[E0308]: mismatched types
  --> tests/macro/invalid_data.rs:5:17
   |
-5 | #[derive(Debug, Endpoint, Serialize)]
-  |                 ^^^^^^^^
-  |                 |
-  |                 expected `Vec<u8>`, found `String`
-  |                 arguments to this enum variant are incorrect
-  |
-  = note: expected struct `Vec<u8>`
-             found struct `std::string::String`
-help: the type constructed contains `std::string::String` due to the type of the argument passed
- --> tests/macro/invalid_data.rs:5:17
-  |
-5 | #[derive(Debug, Endpoint, Serialize)]
-  |                 ^^^^^^^^ this argument influences the type of `Some`
+  5 | #[derive(Debug, Endpoint, Serialize)]
+    |                 ^^^^^^^^
+    |                 |
+    |                 expected `Vec<u8>`, found `String`
+    |                 arguments to this enum variant are incorrect
+    |
+    = note: expected struct `Vec<u8>`
+               found struct `String`
+help: the type constructed contains `String` due to the type of the argument passed
+   --> tests/macro/invalid_data.rs:5:17
+    |
+  5 | #[derive(Debug, Endpoint, Serialize)]
+    |                 ^^^^^^^^ this argument influences the type of `Some`
 note: tuple variant defined here
- --> $RUST/core/src/option.rs
-  = note: this error originates in the derive macro `Endpoint` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: call `Into::into` on this expression to convert `std::string::String` into `Vec<u8>`
-  |
-5 | #[derive(Debug, Endpoint.into(), Serialize)]
-  |                         +++++++
+   --> $RUST/core/src/option.rs
+    |
+    |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
+    |     ^^^^
+    = note: this error originates in the derive macro `Endpoint` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/macro/invalid_method.stderr

@@ -4,7 +4,7 @@ warning: unused import: `rustify::endpoint::Endpoint`
 1 | use rustify::endpoint::Endpoint;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
-  = note: `#[warn(unused_imports)]` on by default
+  = note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
 
 error[E0599]: no variant or associated item named `TEST` found for enum `RequestMethod` in the current scope
  --> tests/macro/invalid_method.rs:6:41

tests/macro/invalid_result.stderr

@@ -10,4 +10,4 @@ warning: unused import: `rustify::endpoint::Endpoint`
 1 | use rustify::endpoint::Endpoint;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
-  = note: `#[warn(unused_imports)]` on by default
+  = note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default

tests/macro/invalid_type.stderr

@@ -4,7 +4,7 @@ warning: unused import: `rustify::endpoint::Endpoint`
 1 | use rustify::endpoint::Endpoint;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
-  = note: `#[warn(unused_imports)]` on by default
+  = note: `#[warn(unused_imports)]` (part of `#[warn(unused)]`) on by default
 
 error[E0599]: no variant or associated item named `BAD` found for enum `RequestType` in the current scope
  --> tests/macro/invalid_type.rs:6:47