Skip to content

Commit

Permalink
Fixed linter based on rust 1.80.0
Browse files Browse the repository at this point in the history
  • Loading branch information
barshaul committed Jul 26, 2024
1 parent c7b598b commit b8c921d
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions redis/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions redis/src/cluster_async/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions redis/src/cluster_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion redis/tests/support/cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion redis/tests/support/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion redis/tests/test_basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions redis/tests/test_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ mod types {
/// The `FromRedisValue` trait provides two methods for parsing:
/// - `fn from_redis_value(&Value) -> Result<T, RedisError>`
/// - `fn from_owned_redis_value(Value) -> Result<T, RedisError>`
/// 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,
Expand Down

0 comments on commit b8c921d

Please sign in to comment.