Merge branch 'redis-rs:main' into main

Author: feelingsonice

Cargo.lock

@@ -14,7 +14,7 @@ The crate is called `redis` and you can depend on it via cargo:
 
 ```ini
 [dependencies]
-redis = "0.27.0"
+redis = "0.27.3"
 ```
 
 Documentation on the library can be found at
@@ -57,10 +57,10 @@ To enable asynchronous clients, enable the relevant feature in your Cargo.toml,
 
 ```
 # if you use tokio
-redis = { version = "0.27.0", features = ["tokio-comp"] }
+redis = { version = "0.27.3", features = ["tokio-comp"] }
 
 # if you use async-std
-redis = { version = "0.27.0", features = ["async-std-comp"] }
+redis = { version = "0.27.3", features = ["async-std-comp"] }
 ```
 
 ## TLS Support
@@ -71,25 +71,25 @@ Currently, `native-tls` and `rustls` are supported.
 To use `native-tls`:
 
 ```
-redis = { version = "0.27.0", features = ["tls-native-tls"] }
+redis = { version = "0.27.3", features = ["tls-native-tls"] }
 
 # if you use tokio
-redis = { version = "0.27.0", features = ["tokio-native-tls-comp"] }
+redis = { version = "0.27.3", features = ["tokio-native-tls-comp"] }
 
 # if you use async-std
-redis = { version = "0.27.0", features = ["async-std-native-tls-comp"] }
+redis = { version = "0.27.3", features = ["async-std-native-tls-comp"] }
 ```
 
 To use `rustls`:
 
 ```
-redis = { version = "0.27.0", features = ["tls-rustls"] }
+redis = { version = "0.27.3", features = ["tls-rustls"] }
 
 # if you use tokio
-redis = { version = "0.27.0", features = ["tokio-rustls-comp"] }
+redis = { version = "0.27.3", features = ["tokio-rustls-comp"] }
 
 # if you use async-std
-redis = { version = "0.27.0", features = ["async-std-rustls-comp"] }
+redis = { version = "0.27.3", features = ["async-std-rustls-comp"] }
 ```
 
 With `rustls`, you can add the following feature flags on top of other feature flags to enable additional features:
@@ -115,7 +115,7 @@ let client = redis::Client::open("rediss://127.0.0.1/#insecure")?;
 
 Support for Redis Cluster can be enabled by enabling the `cluster` feature in your Cargo.toml:
 
-`redis = { version = "0.27.0", features = [ "cluster"] }`
+`redis = { version = "0.27.3", features = [ "cluster"] }`
 
 Then you can simply use the `ClusterClient`, which accepts a list of available nodes. Note
 that only one node in the cluster needs to be specified when instantiating the client, though
@@ -138,7 +138,7 @@ fn fetch_an_integer() -> String {
 Async Redis Cluster support can be enabled by enabling the `cluster-async` feature, along
 with your preferred async runtime, e.g.:
 
-`redis = { version = "0.27.0", features = [ "cluster-async", "tokio-std-comp" ] }`
+`redis = { version = "0.27.3", features = [ "cluster-async", "tokio-std-comp" ] }`
 
 ```rust
 use redis::cluster::ClusterClient;
@@ -158,7 +158,7 @@ async fn fetch_an_integer() -> String {
 
 Support for the RedisJSON Module can be enabled by specifying "json" as a feature in your Cargo.toml.
 
-`redis = { version = "0.27.0", features = ["json"] }`
+`redis = { version = "0.27.3", features = ["json"] }`
 
 Then you can simply import the `JsonCommands` trait which will add the `json` commands to all Redis Connections (not to be confused with just `Commands` which only adds the default commands)
 

README.md

@@ -1,3 +1,20 @@
+### 0.27.3 (2024-10-01)
+
+#### Changes & Bug fixes
+
+* Add support for [TYPE type] in SCAN commands ([#1332](https://github.com/redis-rs/redis-rs/pull/1332) @Reiuji-ch)
+* Align default timeouts on cluster client. ([#1333](https://github.com/redis-rs/redis-rs/pull/1333))
+* Updates unmaintained tokio-retry to tokio-retry2 ([#1334](https://github.com/redis-rs/redis-rs/pull/1334) @naomijub)
+* Align verification of protocol & TLS during cluster creation. ([#1289](https://github.com/redis-rs/redis-rs/pull/1289))
+* Include the StreamExt use statement in docs ([#1345](https://github.com/redis-rs/redis-rs/pull/1345) @joshrotenberg)
+* Further limit parser recursion ([#1346](https://github.com/redis-rs/redis-rs/pull/1346))
+
+#### CI improvements
+
+* Improve testing async-std ([#1314](https://github.com/redis-rs/redis-rs/pull/1314))
+* Test against Valkey in CI. ([#1315](https://github.com/redis-rs/redis-rs/pull/1315))
+* Add CI action to test whether feature combinations compile. ([#1328](https://github.com/redis-rs/redis-rs/pull/1328))
+
 ### 0.27.2 (2024-09-14)
 
 #### Changes & Bug fixes

redis/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "redis"
-version = "0.27.2"
+version = "0.27.3"
 keywords = ["redis", "database"]
 description = "Redis driver for Rust."
 homepage = "https://github.com/redis-rs/redis-rs"

redis/Cargo.toml

@@ -1420,6 +1420,42 @@ implement_commands! {
         cmd("XADD").arg(key).arg(id).arg(map)
     }
 
+
+    /// Add a stream message with options.
+    ///
+    /// Items can be any list type, e.g.
+    /// ```rust
+    /// // static items
+    /// let items = &[("key", "val"), ("key2", "val2")];
+    /// # use std::collections::BTreeMap;
+    /// // A map (Can be BTreeMap, HashMap, etc)
+    /// let mut map: BTreeMap<&str, &str> = BTreeMap::new();
+    /// map.insert("ab", "cd");
+    /// map.insert("ef", "gh");
+    /// map.insert("ij", "kl");
+    /// ```
+    ///
+    /// ```text
+    /// XADD key [NOMKSTREAM] [<MAXLEN|MINID> [~|=] threshold [LIMIT count]] <* | ID> field value [field value] ...
+    /// ```
+    #[cfg(feature = "streams")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "streams")))]
+    fn xadd_options<
+        K: ToRedisArgs, ID: ToRedisArgs, I: ToRedisArgs
+    >(
+        key: K,
+        id: ID,
+        items: I,
+        options: &'a streams::StreamAddOptions
+    ) {
+        cmd("XADD")
+            .arg(key)
+            .arg(options)
+            .arg(id)
+            .arg(items)
+    }
+
+
     /// Add a stream message while capping the stream at a maxlength.
     ///
     /// ```text
@@ -1563,7 +1599,7 @@ implement_commands! {
     /// ```text
     /// XCLAIM <key> <group> <consumer> <min-idle-time> <ID-1> <ID-2>
     ///     [IDLE <milliseconds>] [TIME <mstime>] [RETRYCOUNT <count>]
-    ///     [FORCE] [JUSTID]
+    ///     [FORCE] [JUSTID] [LASTID <lastid>]
     /// ```
     #[cfg(feature = "streams")]
     #[cfg_attr(docsrs, doc(cfg(feature = "streams")))]
@@ -2085,6 +2121,20 @@ implement_commands! {
         cmd("XTRIM").arg(key).arg(maxlen)
     }
 
+     /// Trim a stream `key` with full options
+     ///
+     /// ```text
+     /// XTRIM <key> <MAXLEN|MINID> [~|=] <threshold> [LIMIT <count>]  (Same as XADD MAXID|MINID options)
+     /// ```
+    #[cfg(feature = "streams")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "streams")))]
+    fn xtrim_options<K: ToRedisArgs>(
+        key: K,
+        options: &'a streams::StreamTrimOptions
+    ) {
+        cmd("XTRIM").arg(key).arg(options)
+    }
+
     // script commands
 
     /// Adds a prepared script command to the pipeline.