Fixes for rust 1.80.0

valkey-io · Jul 27, 2024 · 1027752 · 1027752
1 parent 1e3a396
commit 1027752
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/glide-core/Cargo.toml b/glide-core/Cargo.toml
@@ -30,6 +30,7 @@ nanoid = "0.4.0"
 
 [features]
 socket-layer = ["directories", "integer-encoding", "num_cpus", "protobuf", "tokio-util"]
+standalone_heartbeat = []
 
 [dev-dependencies]
 rsevents = "0.3.1"

diff --git a/glide-core/src/client/standalone_client.rs b/glide-core/src/client/standalone_client.rs
@@ -6,7 +6,7 @@ use super::reconnecting_connection::ReconnectingConnection;
 use super::{ConnectionRequest, NodeAddress, TlsMode};
 use crate::retry_strategies::RetryStrategy;
 use futures::{future, stream, StreamExt};
-#[cfg(standalone_heartbeat)]
+#[cfg(feature = "standalone_heartbeat")]
 use logger_core::log_debug;
 use logger_core::log_warn;
 use rand::Rng;
@@ -15,7 +15,7 @@ use redis::{PushInfo, RedisError, RedisResult, Value};
 use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 use tokio::sync::mpsc;
-#[cfg(standalone_heartbeat)]
+#[cfg(feature = "standalone_heartbeat")]
 use tokio::task;
 
 #[derive(Debug)]
@@ -185,7 +185,7 @@ impl StandaloneClient {
         }
         let read_from = get_read_from(connection_request.read_from);
 
-        #[cfg(standalone_heartbeat)]
+        #[cfg(feature = "standalone_heartbeat")]
         for node in nodes.iter() {
             Self::start_heartbeat(node.clone());
         }
@@ -363,7 +363,7 @@ impl StandaloneClient {
         }
     }
 
-    #[cfg(standalone_heartbeat)]
+    #[cfg(feature = "standalone_heartbeat")]
     fn start_heartbeat(reconnecting_connection: ReconnectingConnection) {
         task::spawn(async move {
             loop {

diff --git a/glide-core/tests/test_standalone_client.rs b/glide-core/tests/test_standalone_client.rs
@@ -59,7 +59,7 @@ mod standalone_client_tests {
     #[rstest]
     #[serial_test::serial]
     #[timeout(LONG_STANDALONE_TEST_TIMEOUT)]
-    #[cfg(standalone_heartbeat)]
+    #[cfg(feature = "standalone_heartbeat")]
     fn test_detect_disconnect_and_reconnect_using_heartbeat(#[values(false, true)] use_tls: bool) {
         let (sender, receiver) = tokio::sync::oneshot::channel();
         block_on_all(async move {

diff --git a/logger_core/Cargo.toml b/logger_core/Cargo.toml
@@ -13,7 +13,7 @@ test-env-helpers = "0.2.2"
 
 [dependencies]
 tracing = "0.1"
-tracing-appender = "0.2.2"
+tracing-appender = { version = "0.2.3", default-features = false }
 once_cell = "1.16.0"
 file-rotate = "0.7.1"
 tracing-subscriber = "0.3.17"