From b8c921d7186855997a8ff89465653e84bfa4eb38 Mon Sep 17 00:00:00 2001 From: barshaul Date: Thu, 25 Jul 2024 14:56:43 +0000 Subject: [PATCH] Fixed linter based on rust 1.80.0 --- redis/src/client.rs | 8 ++++---- redis/src/cluster_async/mod.rs | 8 ++++---- redis/src/cluster_client.rs | 8 ++++---- redis/tests/support/cluster.rs | 2 +- redis/tests/support/mod.rs | 2 +- redis/tests/test_basic.rs | 2 +- redis/tests/test_types.rs | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/redis/src/client.rs b/redis/src/client.rs index 5e6638c10..7ace00089 100644 --- a/redis/src/client.rs +++ b/redis/src/client.rs @@ -687,10 +687,10 @@ impl Client { /// /// - `conn_info` - URL using the `rediss://` scheme. /// - `tls_certs` - `TlsCertificates` structure containing: - /// -- `client_tls` - Optional `ClientTlsConfig` containing byte streams for - /// --- `client_cert` - client's byte stream containing client certificate in PEM format - /// --- `client_key` - client's byte stream containing private key in PEM format - /// -- `root_cert` - Optional byte stream yielding PEM formatted file for root certificates. + /// -- `client_tls` - Optional `ClientTlsConfig` containing byte streams for + /// --- `client_cert` - client's byte stream containing client certificate in PEM format + /// --- `client_key` - client's byte stream containing private key in PEM format + /// -- `root_cert` - Optional byte stream yielding PEM formatted file for root certificates. /// /// If `ClientTlsConfig` ( cert+key pair ) is not provided, then client-side authentication is not enabled. /// If `root_cert` is not provided, then system root certificates are used instead. diff --git a/redis/src/cluster_async/mod.rs b/redis/src/cluster_async/mod.rs index 52bdf8c92..b6c74e4b9 100644 --- a/redis/src/cluster_async/mod.rs +++ b/redis/src/cluster_async/mod.rs @@ -150,9 +150,9 @@ where /// # Arguments /// /// * `scan_state_rc` - A reference to the scan state, For initiating new scan send [`ScanStateRC::new()`], - /// for each subsequent iteration use the returned [`ScanStateRC`]. + /// for each subsequent iteration use the returned [`ScanStateRC`]. /// * `count` - An optional count of keys requested, - /// the amount returned can vary and not obligated to return exactly count. + /// the amount returned can vary and not obligated to return exactly count. /// * `object_type` - An optional [`ObjectType`] enum of requested key redis type. /// /// # Returns @@ -209,10 +209,10 @@ where /// # Arguments /// /// * `scan_state_rc` - A reference to the scan state, For initiating new scan send [`ScanStateRC::new()`], - /// for each subsequent iteration use the returned [`ScanStateRC`]. + /// for each subsequent iteration use the returned [`ScanStateRC`]. /// * `match_pattern` - A match pattern of requested keys. /// * `count` - An optional count of keys requested, - /// the amount returned can vary and not obligated to return exactly count. + /// the amount returned can vary and not obligated to return exactly count. /// * `object_type` - An optional [`ObjectType`] enum of requested key redis type. /// /// # Returns diff --git a/redis/src/cluster_client.rs b/redis/src/cluster_client.rs index 0dea37b58..7c4763179 100644 --- a/redis/src/cluster_client.rs +++ b/redis/src/cluster_client.rs @@ -358,10 +358,10 @@ impl ClusterClientBuilder { /// checked during `build()` call. /// /// - `certificates` - `TlsCertificates` structure containing: - /// -- `client_tls` - Optional `ClientTlsConfig` containing byte streams for - /// --- `client_cert` - client's byte stream containing client certificate in PEM format - /// --- `client_key` - client's byte stream containing private key in PEM format - /// -- `root_cert` - Optional byte stream yielding PEM formatted file for root certificates. + /// -- `client_tls` - Optional `ClientTlsConfig` containing byte streams for + /// --- `client_cert` - client's byte stream containing client certificate in PEM format + /// --- `client_key` - client's byte stream containing private key in PEM format + /// -- `root_cert` - Optional byte stream yielding PEM formatted file for root certificates. /// /// If `ClientTlsConfig` ( cert+key pair ) is not provided, then client-side authentication is not enabled. /// If `root_cert` is not provided, then system root certificates are used instead. diff --git a/redis/tests/support/cluster.rs b/redis/tests/support/cluster.rs index 3a11d95a4..991331cfc 100644 --- a/redis/tests/support/cluster.rs +++ b/redis/tests/support/cluster.rs @@ -160,7 +160,7 @@ impl RedisCluster { cmd.arg("--cluster-enabled") .arg("yes") .arg("--cluster-config-file") - .arg(&tempdir.path().join("nodes.conf")) + .arg(tempdir.path().join("nodes.conf")) .arg("--cluster-node-timeout") .arg("5000") .arg("--appendonly") diff --git a/redis/tests/support/mod.rs b/redis/tests/support/mod.rs index b55049e7c..8993fe302 100644 --- a/redis/tests/support/mod.rs +++ b/redis/tests/support/mod.rs @@ -296,7 +296,7 @@ impl RedisServer { // prepare redis with TLS redis_cmd .arg("--tls-port") - .arg(&port.to_string()) + .arg(port.to_string()) .arg("--port") .arg("0") .arg("--tls-cert-file") diff --git a/redis/tests/test_basic.rs b/redis/tests/test_basic.rs index b29abc8c7..e31c33384 100644 --- a/redis/tests/test_basic.rs +++ b/redis/tests/test_basic.rs @@ -938,7 +938,7 @@ mod basic { assert_eq!(con.mset(&[("key1", 1), ("key2", 2)]), Ok(())); assert_eq!(con.get(&["key1", "key2"]), Ok((1, 2))); assert_eq!(con.get(vec!["key1", "key2"]), Ok((1, 2))); - assert_eq!(con.get(&vec!["key1", "key2"]), Ok((1, 2))); + assert_eq!(con.get(vec!["key1", "key2"]), Ok((1, 2))); } #[test] diff --git a/redis/tests/test_types.rs b/redis/tests/test_types.rs index f55560b66..d5df513ef 100644 --- a/redis/tests/test_types.rs +++ b/redis/tests/test_types.rs @@ -25,8 +25,8 @@ mod types { /// The `FromRedisValue` trait provides two methods for parsing: /// - `fn from_redis_value(&Value) -> Result` /// - `fn from_owned_redis_value(Value) -> Result` - /// The `RedisParseMode` below allows choosing between the two - /// so that test logic does not need to be duplicated for each. + /// The `RedisParseMode` below allows choosing between the two + /// so that test logic does not need to be duplicated for each. enum RedisParseMode { Owned, Ref,