Merge pull request #105 from 3scale-rs/update-msrv-and-fix-warnings

unleashed · web-flow · commit 2a8a6b5b85b7 · 2025-04-13T17:31:54.000Z
Update MSRV and fix linter warnings
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml
@@ -18,7 +18,9 @@ jobs:
   audit_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - uses: actions-rs/audit-check@v1
         with:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -30,12 +30,15 @@ jobs:
             experimental: true
             cargo_flags: --all-features
           # MSRV
-          - rust: 1.60.0
+          - rust: 1.65.0
             experimental: false
             cargo_flags: ""
+          - rust: 1.81.0
+            experimental: false
+            cargo_flags: --all-features
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
diff --git a/.github/workflows/clippy.yaml b/.github/workflows/clippy.yaml
@@ -13,7 +13,7 @@ jobs:
   clippy_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -28,4 +28,4 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-targets --all-features -- -D warnings
+          args: --all-targets --all-features -- -D warnings -D clippy::all
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -24,21 +24,21 @@ jobs:
           override: true
 
       - name: Install cargo-tarpaulin
-        uses: baptiste0928/cargo-install@v2
+        uses: baptiste0928/cargo-install@v3
         with:
           crate: cargo-tarpaulin
           
       - name: Run cargo tarpaulin
         run: cargo tarpaulin --all-features -o Xml -- --test-threads 1 
 
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: code-coverage-report
           path: cobertura.xml
 
       - name: Upload to codecov.io
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: cobertura.xml
diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-rust-version = "1.60"
+rust-version = "1.65"
 edition = "2021"
 name = "threescalers"
 description = "3scale API client library for Rust"
@@ -31,7 +31,6 @@ http-types = ["dep:http_types"]
 # Add in conversions for reqwest's crate types
 reqwest-async = ["dep:reqwest", "http-types"]
 reqwest-sync = ["dep:reqwest", "reqwest?/blocking", "http-types"]
-#reqwest-sync = ["dep:reqwest", "http-types"]
 reqwest-all = ["reqwest-async", "reqwest-sync"]
 # Add in conversions for curl's crate types
 curl-easy = ["dep:curl"]
@@ -47,20 +46,20 @@ rest-mappings-serde = ["dep:serde"]
 serde = ["dep:serde", "rest-mappings-serde"]
 
 [dependencies]
-percent-encoding = "^2"
-http_types = { version = "^0.2", package = "http", optional = true }
-reqwest = { version = ">= 0.10, < 0.12", optional = true }
-curl = { version = "^0.4", optional = true }
-serde = { version = "^1", optional = true, default-features = false, features = ["alloc", "derive"] }
-serde-xml-rs = { version = "^0.6", optional = true }
-chrono = { version = "^0.4", optional = true, default-features = false }
-no-std-compat = { version = "^0.4", features = ["alloc"] }
-anyhow = { version = "^1", default-features = false }
-regex = { version = "^1", optional = true, default-features = false, features = ["perf"] }
+percent-encoding = "2.1"
+http_types = { version = "1", package = "http", optional = true }
+reqwest = { version = "0.12", optional = true }
+curl = { version = "0.4.10", optional = true }
+serde = { version = "1.0.103", optional = true, default-features = false, features = ["alloc", "derive"] }
+serde-xml-rs = { version = "0.6", optional = true }
+chrono = { version = "0.4.23", optional = true, default-features = false }
+no-std-compat = { version = "0.4", features = ["alloc"] }
+anyhow = { version = "1.0.16", default-features = false }
+regex = { version = "1.3.2", optional = true, default-features = false, features = ["perf"] }
 # lazy_static has a "negative" no_std flag rather than an additive "std" flag :/
 # We'll now recommend users that want no_std to enable the "lazy_static/spin_no_std" feature,
 # since enabling it unconditionally here forces everyone, including std users, to use spinlocks.
-lazy_static = { version = "^1", optional = true }
+lazy_static = { version = "1.4", optional = true }
 
 [[example]]
 name = "reqwest-report"
@@ -75,6 +74,9 @@ name = "curl-easy2-report"
 required-features = ["curl-easy2"]
 
 [dev-dependencies]
-serde_json = "^1.0"
-itertools = "^0.10"
-rand = "^0.8"
+serde_json = "1"
+itertools = "0.10"
+rand = "0.8"
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(feature, values("never_type"))'] }
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ convenience implementations for some comonly used HTTP clients.
 
 ## Rust library crate for the 3scale Service Management API
 
-![Minimum rustc version](https://img.shields.io/badge/rustc-1.60.0+-green.svg)
+![Minimum rustc version](https://img.shields.io/badge/rustc-1.65.0+-green.svg)
 [![docs.rs](https://docs.rs/threescalers/badge.svg)](https://docs.rs/threescalers)
 [![Build Status](https://github.com/3scale-rs/threescalers/actions/workflows/ci.yaml/badge.svg)](https://travis-ci.org/3scale-rs/threescalers)
 [![codecov.io](https://codecov.io/gh/3scale-rs/threescalers/coverage.svg?branch=master)](https://codecov.io/gh/3scale-rs/threescalers/branch/master)
@@ -29,6 +29,9 @@ unnecessarily.
 Some features that pull in dependencies might require higher rustc versions based on
 the dependencies' MSRV.
 
+The current MSRV is 1.65.0, but if you enable any feature related to reqwest, the
+MSRV is bumped to 1.81.0.
+
 ## no_std
 
 `#[no_std]` support can be achieved _if_ allocations are allowed and disabling the default
diff --git a/build.rs b/build.rs
@@ -1,6 +1,7 @@
 // This build.rs file contains an inline vendored fork of autocfg with feature
 // detection capabilities. Please skip to the `autocfg` module if you want to
 // check the details.
+#![allow(clippy::all, clippy::pedantic)]
 
 static REQUIRED_MAJOR: usize = 1;
 static REQUIRED_MINOR: usize = 60;
@@ -15,14 +16,27 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         );
     }
 
+    let check_cfg_enabled = ac.probe_rustc_version(1, 80);
+
+    if check_cfg_enabled {
+        println!("cargo:rustc-check-cfg=cfg(supports_never_type, feature_never_type)");
+    }
     if !ac.emit_type_cfg("!", "supports_never_type") {
         ac.emit_features_with(&["never_type"], |fac| {
             fac.emit_type_cfg("!", "supports_never_type")
         });
     }
 
+    if check_cfg_enabled {
+        println!("cargo:rustc-check-cfg=cfg(feature_test)");
+    }
     ac.emit_feature("test");
 
+    // Emit feature dependency of http-types: requires Never type.
+    // We are forced to do this until Cargo knows about private features.
+    #[cfg(feature = "http-types")]
+    println!("cargo:rustc-cfg=feature=\"never_type\"");
+
     autocfg::rerun_path("build.rs");
 
     Ok(())
diff --git a/src/api_call.rs b/src/api_call.rs
@@ -86,7 +86,7 @@ impl<'a> Builder<'a> {
 use std::borrow::Cow;
 
 impl<'a> ApiCall<'a> {
-    pub fn builder(service: &'a Service) -> Builder {
+    pub fn builder(service: &'a Service) -> Builder<'a> {
         Builder::new(service)
     }
 
diff --git a/src/extensions/extension.rs b/src/extensions/extension.rs
@@ -1,5 +1,6 @@
 use std::prelude::v1::*;
 
+use core::fmt::{self, Display, Formatter};
 use std::borrow::Cow;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -56,9 +57,9 @@ impl Extension<'_> {
     }
 }
 
-impl ToString for Extension<'_> {
-    fn to_string(&self) -> String {
-        self.to_cow().into()
+impl Display for Extension<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), fmt::Error> {
+        write!(f, "{}", self.to_cow().as_ref())
     }
 }
 
diff --git a/src/extensions/list.rs b/src/extensions/list.rs
@@ -1,5 +1,6 @@
 use std::prelude::v1::*;
 
+use core::fmt::{self, Display, Formatter};
 use std::{borrow::Cow, iter::FromIterator, vec::IntoIter};
 
 use super::Extension;
@@ -101,19 +102,23 @@ impl<'s> List<'s> {
     }
 }
 
-impl ToString for List<'_> {
-    fn to_string(&self) -> String {
-        self.0
-            .iter()
-            .map(|e| e.to_string())
-            .collect::<Vec<_>>()
-            .join("&")
+impl Display for List<'_> {
+    fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
+        write!(
+            f,
+            "{}",
+            self.0
+                .iter()
+                .map(ToString::to_string)
+                .collect::<Vec<_>>()
+                .join("&")
+        )
     }
 }
 
 impl<'s> Extend<Extension<'s>> for List<'s> {
     fn extend<T: IntoIterator<Item = Extension<'s>>>(&mut self, iter: T) {
-        self.0.extend(iter)
+        self.0.extend(iter);
     }
 }
 
@@ -151,3 +156,13 @@ impl<'s> IntoIterator for List<'s> {
         self.0.into_iter()
     }
 }
+
+impl<'s> List<'s> {
+    pub fn iter<'v>(&'v self) -> <&'v Vec<Extension<'s>> as IntoIterator>::IntoIter {
+        <&Self as IntoIterator>::into_iter(self)
+    }
+
+    pub fn iter_mut<'v>(&'v mut self) -> <&'v mut Vec<Extension<'s>> as IntoIterator>::IntoIter {
+        <&mut Self as IntoIterator>::into_iter(self)
+    }
+}
diff --git a/src/http/parameters.rs b/src/http/parameters.rs
@@ -17,7 +17,7 @@ use std::{iter::Map, slice::Iter};
 type ParamsMapper<'a, 'p, S, T> = Map<Iter<'a, (Cow<'p, str>, S)>, fn(&(Cow<'p, str>, S)) -> T>;
 
 impl Parameters {
-    pub fn new<S: AsRef<str>>(method: &Method, params: &[(Cow<str>, S)]) -> Self {
+    pub fn new<S: AsRef<str>>(method: Method, params: &[(Cow<str>, S)]) -> Self {
         let params_s = Self::params_to_query(params);
 
         if Self::method_requires_body(method) {
@@ -28,8 +28,8 @@ impl Parameters {
     }
 
     #[inline]
-    fn method_requires_body(method: &Method) -> bool {
-        !matches!(*method, Method::GET | Method::HEAD | Method::DELETE)
+    fn method_requires_body(method: Method) -> bool {
+        !matches!(method, Method::GET | Method::HEAD | Method::DELETE)
     }
 
     pub fn path_and_query<'p>(&self, path: &'p str) -> Cow<'p, str> {
@@ -64,8 +64,7 @@ impl Parameters {
 
     pub fn into_inner(self) -> String {
         match self {
-            Parameters::Query(s) => s,
-            Parameters::Body(s) => s,
+            Parameters::Query(s) | Parameters::Body(s) => s,
         }
     }
 
diff --git a/src/http/request.rs b/src/http/request.rs
@@ -73,7 +73,7 @@ impl From<&ApiCall<'_>> for Request {
         let mut params = Vec::with_capacity(8);
         apicall.to_params(&mut params);
 
-        let parameters = Parameters::new(&method, params.as_slice());
+        let parameters = Parameters::new(method, params.as_slice());
 
         let mut headers = apicall.extensions().map_or_else(
             || HeaderMap::with_capacity(1),
diff --git a/src/http/request/curl/easy2.rs b/src/http/request/curl/easy2.rs
@@ -22,7 +22,7 @@ pub trait SetBody: Handler {
 }
 
 /// A default type that works with the requirements of conversion between a Request and a set up
-/// Easy2 client by implementing the SetBody trait.
+/// Easy2 client by implementing the `SetBody` trait.
 #[derive(Debug, Clone)]
 pub struct BodyHandle {
     count: usize,
@@ -37,7 +37,7 @@ impl BodyHandle {
         }
     }
 
-    /// A method to set/unset the body. To be used from a SetBody trait impl.
+    /// A method to set/unset the body. To be used from a `SetBody` trait impl.
     pub fn with_body(&mut self, body: Option<String>) {
         self.body = body;
     }
diff --git a/src/lib.rs b/src/lib.rs
@@ -29,7 +29,7 @@ pub mod version;
 pub mod response;
 
 pub(crate) mod error {
-    pub use anyhow::{anyhow, Error, Result};
+    pub use anyhow::{anyhow, Error};
 }
 
 pub use error::Error;
diff --git a/src/response.rs b/src/response.rs
@@ -110,7 +110,7 @@ impl AuthorizationError {
     }
 }
 
-#[derive(Debug, Deserialize, PartialEq)]
+#[derive(Debug, Deserialize, PartialEq, Eq)]
 pub struct Metric(pub String);
 
 impl FromStr for Authorization {
diff --git a/src/response/usage_report.rs b/src/response/usage_report.rs
@@ -144,7 +144,7 @@ pub enum Period {
 
 struct PeriodStringVisitor;
 
-impl<'de> Visitor<'de> for PeriodStringVisitor {
+impl Visitor<'_> for PeriodStringVisitor {
     type Value = Period;
 
     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -271,7 +271,7 @@ mod tests {
         let exceeded_limits = auth.unwrap_err();
         assert_eq!(exceeded_limits, UsageReportError::LimitsExceeded(1));
         assert!(ur.is_limited());
-        ur.reset(std::u64::MAX);
+        ur.reset(u64::MAX);
         let new_auth = ur.authorize(1);
         assert!(new_auth.is_err());
         let auth_err = new_auth.unwrap_err();
diff --git a/src/util.rs b/src/util.rs
@@ -1,5 +1,6 @@
 #[macro_use]
 pub mod compat;
+#[cfg(feature = "never_type")]
 pub use compat::features::Never;
 
 pub mod string;
diff --git a/src/util/compat/features.rs b/src/util/compat/features.rs
@@ -1,2 +1,4 @@
+#[cfg(feature = "never_type")]
 mod never;
+#[cfg(feature = "never_type")]
 pub use never::Never;
diff --git a/src/util/compat/features/never.rs b/src/util/compat/features/never.rs
@@ -1,7 +1,4 @@
-// Depending on features used, this type might become unused
 #[cfg(supports_never_type)]
-#[allow(dead_code)]
 pub type Never = !;
 #[cfg(not(supports_never_type))]
-#[allow(dead_code)]
 pub type Never = core::convert::Infallible;

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ impl<'a> Builder<'a> {`
`86`	`86`	`use std::borrow::Cow;`
`87`	`87`
`88`	`88`	`impl<'a> ApiCall<'a> {`
`89`		`- pub fn builder(service: &'a Service) -> Builder {`
	`89`	`+ pub fn builder(service: &'a Service) -> Builder<'a> {`
`90`	`90`	`Builder::new(service)`
`91`	`91`	`}`
`92`	`92`