Merge (with fixes) pull request #168 from madiele/dependabot/cargo/ru…

…st-dependencies-c27f022494

Bump the rust-dependencies group with 2 updates

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "image": "mcr.microsoft.com/devcontainers/rust:latest",
   "postCreateCommand": "./.devcontainer/PostCreateScript.sh",
 "postStartCommand": "make start-deps",
 "customizations": {
@@ -10,5 +10,8 @@
 			"ms-azuretools.vscode-docker"
 		]
 	}
+},
+"features": {
+	"ghcr.io/devcontainers/features/docker-in-docker:2": "latest"
 }
 }

Cargo.toml

@@ -21,7 +21,7 @@ futures = "=0.3.30"
 log = "=0.4.21"
 regex = "=1.10.4"
 reqwest = { version = "=0.12.4", features = ["json"] }
-serde = "=1.0.198"
+serde = "=1.0.199"
 serde_json = "=1.0.116"
 tokio = { version = "=1.37.0", features = ["macros", "process"]}
 uuid = { version= "=1.8.0", features = ["v4", "serde"]}
@@ -32,7 +32,7 @@ eyre = "=0.6"
 simple_logger = "=4.3"
 redis = { version = "=0.25", features = ["tokio-comp"] }
 mime = "=0.3.17"
-cached = { version = "=0.49.3", features = ["redis_tokio"] }
+cached = { version = "=0.50.0", features = ["redis_tokio"] }
 iso8601-duration = "=0.2.0"
 chrono = "=0.4.38"
 feed-rs = "=1.4.0"

src/lib.rs

@@ -6,11 +6,11 @@ pub mod rss_transcodizer;
 pub mod server;
 pub mod transcoder;
 
-pub async fn get_redis_client() -> Result<redis::aio::Connection, eyre::Error> {
+pub async fn get_redis_client() -> Result<redis::aio::MultiplexedConnection, eyre::Error> {
     let redis_address = conf().get(ConfName::RedisAddress).unwrap();
     let redis_port = conf().get(ConfName::RedisPort).unwrap();
     let client = redis::Client::open(format!("redis://{}:{}/", redis_address, redis_port))?;
-    let con = client.get_tokio_connection().await?;
+    let con = client.get_multiplexed_tokio_connection().await?;
     Ok(con)
 }
 

src/provider/youtube.rs

@@ -258,7 +258,7 @@ struct VideoExtraInfo {
 }
 
 async fn create_duration_url_map(
-    items: &Vec<PlaylistItem>,
+    items: &[PlaylistItem],
     api_key: &str,
 ) -> Result<HashMap<String, VideoExtraInfo>, eyre::Error> {
     let ids_batches = items.chunks(50).map(|c| {
@@ -467,7 +467,7 @@ fn get_youtube_hub() -> YouTube<hyper_rustls::HttpsConnector<hyper::client::Http
 
 #[io_cached(
     map_error = r##"|e| eyre::Error::new(e)"##,
-    type = "AsyncRedisCache<Url, Url>",
+    ty = "AsyncRedisCache<Url, Url>",
     create = r##" {
         AsyncRedisCache::new("cached_yt_stream_url=", 18000)
             .set_refresh(false)
@@ -543,7 +543,7 @@ async fn feed_url_for_yt_channel(url: &Url) -> eyre::Result<Url> {
     not(test),
     io_cached(
         map_error = r##"|e| eyre::Error::new(e)"##,
-        type = "AsyncRedisCache<Url, Url>",
+        ty = "AsyncRedisCache<Url, Url>",
         create = r##" {
         AsyncRedisCache::new("youtube_channel_username_to_id=", 9999999)
             .set_refresh(false)
@@ -627,7 +627,7 @@ fn convert_atom_to_rss(feed: Feed, duration_map: HashMap<String, Option<usize>>)
     not(test),
     io_cached(
         map_error = r##"|e| eyre::Error::new(e)"##,
-        type = "AsyncRedisCache<Url, Option<usize>>",
+        ty = "AsyncRedisCache<Url, Option<usize>>",
         create = r##" {
         AsyncRedisCache::new("cached_yt_video_duration=", 86400)
             .set_refresh(false)