TsAlign, TsBucketTimestamp, TsRangeQuery

tompro · Dec 11, 2022 · 1329359 · 1329359
1 parent e487963
commit 1329359
Show file tree

Hide file tree

Showing 3 changed files with 247 additions and 48 deletions.
diff --git a/src/commands.rs b/src/commands.rs
@@ -201,8 +201,8 @@ pub trait TsCommands: ConnectionLike + Sized {
         FTS: ToRedisArgs,
         TTS: ToRedisArgs,
         C: ToRedisArgs,
-        TS: std::marker::Copy + FromRedisValue,
-        V: std::marker::Copy + FromRedisValue,
+        TS: Copy + FromRedisValue,
+        V: Copy + FromRedisValue,
     >(
         &mut self,
         command: &str,
@@ -226,8 +226,8 @@ pub trait TsCommands: ConnectionLike + Sized {
         FTS: ToRedisArgs,
         TTS: ToRedisArgs,
         C: ToRedisArgs,
-        TS: std::marker::Copy + FromRedisValue,
-        V: std::marker::Copy + FromRedisValue,
+        TS: Copy + FromRedisValue,
+        V: Copy + FromRedisValue,
     >(
         &mut self,
         key: K,
@@ -252,8 +252,8 @@ pub trait TsCommands: ConnectionLike + Sized {
         FTS: ToRedisArgs,
         TTS: ToRedisArgs,
         C: ToRedisArgs,
-        TS: std::marker::Copy + FromRedisValue,
-        V: std::marker::Copy + FromRedisValue,
+        TS: Copy + FromRedisValue,
+        V: Copy + FromRedisValue,
     >(
         &mut self,
         key: K,
@@ -277,8 +277,8 @@ pub trait TsCommands: ConnectionLike + Sized {
         FTS: ToRedisArgs,
         TTS: ToRedisArgs,
         C: ToRedisArgs,
-        TS: std::default::Default + FromRedisValue + Copy,
-        V: std::default::Default + FromRedisValue + Copy,
+        TS: Default + FromRedisValue + Copy,
+        V: Default + FromRedisValue + Copy,
     >(
         &mut self,
         command: &str,
@@ -302,8 +302,8 @@ pub trait TsCommands: ConnectionLike + Sized {
         FTS: ToRedisArgs,
         TTS: ToRedisArgs,
         C: ToRedisArgs,
-        TS: std::default::Default + FromRedisValue + Copy,
-        V: std::default::Default + FromRedisValue + Copy,
+        TS: Default + FromRedisValue + Copy,
+        V: Default + FromRedisValue + Copy,
     >(
         &mut self,
         from_timestamp: FTS,
@@ -327,8 +327,8 @@ pub trait TsCommands: ConnectionLike + Sized {
         FTS: ToRedisArgs,
         TTS: ToRedisArgs,
         C: ToRedisArgs,
-        TS: std::default::Default + FromRedisValue + Copy,
-        V: std::default::Default + FromRedisValue + Copy,
+        TS: Default + FromRedisValue + Copy,
+        V: Default + FromRedisValue + Copy,
     >(
         &mut self,
         from_timestamp: FTS,
@@ -356,10 +356,7 @@ pub trait TsCommands: ConnectionLike + Sized {
     }
 
     /// Returns the latest (current) value from multiple redis time series.
-    fn ts_mget<
-        TS: std::default::Default + FromRedisValue,
-        V: std::default::Default + FromRedisValue,
-    >(
+    fn ts_mget<TS: Default + FromRedisValue, V: Default + FromRedisValue>(
         &mut self,
         filter_options: TsFilterOptions,
     ) -> RedisResult<TsMget<TS, V>> {

diff --git a/src/lib.rs b/src/lib.rs
@@ -35,7 +35,7 @@
 //! redis_ts::TsCommands into the scope. All redis time series
 //! commands will then be available on your redis connection.
 //!
-//!  
+//!
 //! ```rust,no_run
 //! # fn run() -> redis::RedisResult<()> {
 //! use redis::Commands;
@@ -338,14 +338,16 @@
 //! # Ok(()) }
 //! ```
 //!
+extern crate core;
+
 #[cfg(any(feature = "tokio-comp", feature = "async-std-comp"))]
 pub use crate::async_commands::AsyncTsCommands;
 
 pub use crate::commands::TsCommands;
 
 pub use crate::types::{
-    TsAggregationType, TsDuplicatePolicy, TsFilterOptions, TsInfo, TsMget, TsMrange, TsOptions,
-    TsRange,
+    TsAggregationType, TsAlign, TsBucketTimestamp, TsDuplicatePolicy, TsFilterOptions, TsInfo,
+    TsMget, TsMrange, TsOptions, TsRange, TsRangeQuery,
 };
 
 #[cfg(any(feature = "tokio-comp", feature = "async-std-comp"))]