Clippy updates. Update regex version

Author: jyoung15

benches/client.rs

@@ -59,13 +59,12 @@ async fn main() {
         1000000.0 * successful_count as f64 / (end - start).as_micros() as f64
     );
     println!(
-        "{} successful requests, {} errors",
-        successful_count, error_count
+        "{successful_count} successful requests, {error_count} errors"
     );
 }
 
 async fn prepare_influxdb(client: &Client, db_name: &str) {
-    let create_db_stmt = format!("CREATE DATABASE {}", db_name);
+    let create_db_stmt = format!("CREATE DATABASE {db_name}");
     client
         .query(&ReadQuery::new(create_db_stmt))
         .await

influxdb/Cargo.toml

@@ -18,7 +18,7 @@ futures-util = "0.3.17"
 http = "0.2.4"
 influxdb_derive = { version = "0.5.0", optional = true }
 lazy_static = "1.4.0"
-regex = "1.7.0"
+regex = "1.11.0"
 reqwest = { version = "0.11.13", default-features = false, optional = true }
 surf = { version = "2.3.2", default-features = false, optional = true }
 serde = { version = "1.0.104", features = ["derive"], optional = true }
@@ -41,3 +41,11 @@ wasm-client = ["surf", "surf/wasm-client"]
 [dev-dependencies]
 indoc = "1.0"
 tokio = { version = "1.23", features = ["macros", "rt-multi-thread"] }
+
+[lints.clippy]
+pedantic = { level = "warn", priority = -1 }
+nursery = { level = "warn", priority = -1 }
+module_name_repetitions = "allow"
+missing_panics_doc = "allow"
+missing_errors_doc = "allow"
+future_not_send = "allow"

influxdb/src/client/mod.rs

@@ -1,8 +1,8 @@
-//! Client which can read and write data from InfluxDB.
+//! Client which can read and write data from `InfluxDB`.
 //!
 //! # Arguments
 //!
-//!  * `url`: The URL where InfluxDB is running (ex. `http://localhost:8086`).
+//!  * `url`: The URL where `InfluxDB` is running (ex. `http://localhost:8086`).
 //!  * `database`: The Database against which queries and writes will be run.
 //!
 //! # Examples
@@ -49,7 +49,7 @@ impl<'a> Debug for RedactPassword<'a> {
                 _ => (*k, v.as_str()),
             })
             .collect::<BTreeMap<&'static str, &str>>();
-        f.debug_map().entries(entries.into_iter()).finish()
+        f.debug_map().entries(entries).finish()
     }
 }
 
@@ -67,7 +67,7 @@ impl Client {
     ///
     /// # Arguments
     ///
-    ///  * `url`: The URL where InfluxDB is running (ex. `http://localhost:8086`).
+    ///  * `url`: The URL where `InfluxDB` is running (ex. `http://localhost:8086`).
     ///  * `database`: The Database against which queries and writes will be run.
     ///
     /// # Examples
@@ -85,7 +85,7 @@ impl Client {
     {
         let mut parameters = HashMap::<&str, String>::new();
         parameters.insert("db", database.into());
-        Client {
+        Self {
             url: Arc::new(url.into()),
             parameters: Arc::new(parameters),
             client: HttpClient::new(),
@@ -96,7 +96,7 @@ impl Client {
     ///
     /// # Arguments
     ///
-    /// * username: The Username for InfluxDB.
+    /// * username: The Username for `InfluxDB`.
     /// * password: The Password for the user.
     ///
     /// # Examples
@@ -127,33 +127,35 @@ impl Client {
     }
 
     /// Returns the name of the database the client is using
+    #[must_use]
     pub fn database_name(&self) -> &str {
         // safe to unwrap: we always set the database name in `Self::new`
         self.parameters.get("db").unwrap()
     }
 
-    /// Returns the URL of the InfluxDB installation the client is using
+    /// Returns the URL of the `InfluxDB` installation the client is using
+    #[must_use]
     pub fn database_url(&self) -> &str {
         &self.url
     }
 
-    /// Pings the InfluxDB Server
+    /// Pings the `InfluxDB` Server
     ///
     /// Returns a tuple of build type and version number
     pub async fn ping(&self) -> Result<(String, String), Error> {
+        const BUILD_HEADER: &str = "X-Influxdb-Build";
+        const VERSION_HEADER: &str = "X-Influxdb-Version";
+
         let url = &format!("{}/ping", self.url);
         let res = self
             .client
             .get(url)
             .send()
             .await
             .map_err(|err| Error::ProtocolError {
-                error: format!("{}", err),
+                error: format!("{err}"),
             })?;
 
-        const BUILD_HEADER: &str = "X-Influxdb-Build";
-        const VERSION_HEADER: &str = "X-Influxdb-Version";
-
         #[cfg(feature = "reqwest")]
         let (build, version) = {
             let hdrs = res.headers();
@@ -172,9 +174,9 @@ impl Client {
         Ok((build.unwrap().to_owned(), version.unwrap().to_owned()))
     }
 
-    /// Sends a [`ReadQuery`](crate::ReadQuery) or [`WriteQuery`](crate::WriteQuery) to the InfluxDB Server.
+    /// Sends a [`ReadQuery`](crate::ReadQuery) or [`WriteQuery`](crate::WriteQuery) to the `InfluxDB` Server.
     ///
-    /// A version capable of parsing the returned string is available under the [serde_integration](crate::integrations::serde_integration)
+    /// A version capable of parsing the returned string is available under the [`serde_integration`](crate::integrations::serde_integration)
     ///
     /// # Arguments
     ///
@@ -267,15 +269,15 @@ impl Client {
         // todo: improve error parsing without serde
         if s.contains("\"error\"") {
             return Err(Error::DatabaseError {
-                error: format!("influxdb error: \"{}\"", s),
+                error: format!("influxdb error: \"{s}\""),
             });
         }
 
         Ok(s)
     }
 }
 
-pub(crate) fn check_status(res: &HttpResponse) -> Result<(), Error> {
+pub fn check_status(res: &HttpResponse) -> Result<(), Error> {
     let status = res.status();
     if status == StatusCode::UNAUTHORIZED.as_u16() {
         Err(Error::AuthorizationError)
@@ -294,7 +296,7 @@ mod tests {
     #[test]
     fn test_client_debug_redacted_password() {
         let client = Client::new("https://localhost:8086", "db").with_auth("user", "pass");
-        let actual = format!("{:#?}", client);
+        let actual = format!("{client:#?}");
         let expected = indoc! { r#"
             Client {
                 url: "https://localhost:8086",

influxdb/src/error.rs

@@ -21,7 +21,7 @@ pub enum Error {
     DeserializationError { error: String },
 
     #[error("InfluxDB encountered the following error: {error}")]
-    /// Error which has happened inside InfluxDB
+    /// Error which has happened inside `InfluxDB`
     DatabaseError { error: String },
 
     #[error("authentication error. No or incorrect credentials")]

influxdb/src/integrations/serde_integration/de.rs

@@ -349,10 +349,10 @@ where
         &mut self,
         seed: K,
     ) -> Result<K::Value, Self::Error> {
-        match self.data.next_element_seed(seed)? {
-            Some(value) => Ok(value),
-            None => Err(Error::custom("next_value_seed called but no value")),
-        }
+        (self.data.next_element_seed(seed)?).map_or_else(
+            || Err(Error::custom("next_value_seed called but no value")),
+            Ok,
+        )
     }
 }
 
@@ -382,7 +382,7 @@ mod tests {
 
     impl<T> From<Series<T>> for EqSeries<T> {
         fn from(Series { name, values }: Series<T>) -> Self {
-            EqSeries { name, values }
+            Self { name, values }
         }
     }
 

influxdb/src/integrations/serde_integration/mod.rs

@@ -1,10 +1,10 @@
-//! Serde Integration for InfluxDB. Provides deserialization of query returns.
+//! Serde Integration for `InfluxDB`. Provides deserialization of query returns.
 //!
 //! When querying multiple series in the same query (e.g. with a regex query), it might be desirable to flat map
 //! the resulting series into a single `Vec` like so. The example assumes, that there are weather readings in multiple
 //! series named `weather_<city_name>` (e.g. `weather_berlin`, or `weather_london`). Since we're using a Regex query,
 //! we don't actually know which series will be returned. To assign the city name to the series, we can use the series
-//! `name`, InfluxDB provides alongside query results.
+//! `name`, `InfluxDB` provides alongside query results.
 //!
 //! ```rust,no_run
 //! use influxdb::{Client, Query};
@@ -64,27 +64,25 @@ pub struct DatabaseQueryResult {
 }
 
 impl DatabaseQueryResult {
-    pub fn deserialize_next<T: 'static>(&mut self) -> Result<Return<T>, Error>
+    pub fn deserialize_next<T>(&mut self) -> Result<Return<T>, Error>
     where
-        T: DeserializeOwned + Send,
+        T: 'static + DeserializeOwned + Send,
     {
         serde_json::from_value::<Return<T>>(self.results.remove(0)).map_err(|err| {
             Error::DeserializationError {
-                error: format!("could not deserialize: {}", err),
+                error: format!("could not deserialize: {err}"),
             }
         })
     }
 
-    pub fn deserialize_next_tagged<TAG, T: 'static>(
-        &mut self,
-    ) -> Result<TaggedReturn<TAG, T>, Error>
+    pub fn deserialize_next_tagged<TAG, T>(&mut self) -> Result<TaggedReturn<TAG, T>, Error>
     where
         TAG: DeserializeOwned + Send,
-        T: DeserializeOwned + Send,
+        T: 'static + DeserializeOwned + Send,
     {
         serde_json::from_value::<TaggedReturn<TAG, T>>(self.results.remove(0)).map_err(|err| {
             Error::DeserializationError {
-                error: format!("could not deserialize: {}", err),
+                error: format!("could not deserialize: {err}"),
             }
         })
     }
@@ -98,7 +96,7 @@ pub struct Return<T> {
 }
 
 #[derive(Debug)]
-/// Represents a returned series from InfluxDB
+/// Represents a returned series from `InfluxDB`
 pub struct Series<T> {
     pub name: String,
     pub values: Vec<T>,
@@ -112,7 +110,7 @@ pub struct TaggedReturn<TAG, T> {
 }
 
 #[derive(Debug)]
-/// Represents a returned series from InfluxDB
+/// Represents a returned series from `InfluxDB`
 pub struct TaggedSeries<TAG, T> {
     pub name: String,
     pub tags: TAG,
@@ -122,7 +120,7 @@ pub struct TaggedSeries<TAG, T> {
 impl Client {
     pub async fn json_query(&self, q: ReadQuery) -> Result<DatabaseQueryResult, Error> {
         let query = q.build().map_err(|err| Error::InvalidQueryError {
-            error: format!("{}", err),
+            error: format!("{err}"),
         })?;
 
         let read_query = query.get();
@@ -174,7 +172,7 @@ impl Client {
         // Json has another structure, let's try actually parsing it to the type we're deserializing
         serde_json::from_slice::<DatabaseQueryResult>(&body).map_err(|err| {
             Error::DeserializationError {
-                error: format!("serde error: {}", err),
+                error: format!("serde error: {err}"),
             }
         })
     }

influxdb/src/lib.rs

@@ -5,7 +5,7 @@
 //!
 //! ## Currently Supported Features
 //!
-//! -   Reading and Writing to InfluxDB
+//! -   Reading and Writing to `InfluxDB`
 //! -   Optional Serde Support for Deserialization
 //! -   Running multiple queries in one request (e.g. `SELECT * FROM weather_berlin; SELECT * FROM weather_london`)
 //! -   Writing single or multiple measurements in one request (e.g. `WriteQuery` or `Vec<WriteQuery>` argument)
@@ -24,7 +24,7 @@
 //! influxdb = { version = "0.5.2", features = ["derive"] }
 //! ```
 //!
-//! For an example with using Serde deserialization, please refer to [serde_integration](crate::integrations::serde_integration)
+//! For an example with using Serde deserialization, please refer to [`serde_integration`](crate::integrations::serde_integration)
 //!
 //! ```rust,no_run
 //! use influxdb::{Client, Query, Timestamp, ReadQuery};
@@ -77,7 +77,7 @@
 //!
 //! # Choice of HTTP backend
 //!
-//! To communicate with InfluxDB, you can choose the HTTP backend to be used configuring the appropriate feature. We recommend sticking with the default reqwest-based client, unless you really need async-std compatibility.
+//! To communicate with `InfluxDB`, you can choose the HTTP backend to be used configuring the appropriate feature. We recommend sticking with the default reqwest-based client, unless you really need async-std compatibility.
 //!
 //! - **[hyper](https://github.com/hyperium/hyper)** (through reqwest, used by default), with [rustls](https://github.com/ctz/rustls)
 //!   ```toml