From 70213b5d64d18a43d3f10377e3e53e9f5f189af3 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Thu, 3 Nov 2022 15:26:02 +0100 Subject: [PATCH] fix rust 1.65 clippy warnings, change version --- Cargo.lock | 48 ++++++++++++++++---------------- ffplayout-api/Cargo.toml | 2 +- ffplayout-api/src/api/routes.rs | 2 +- ffplayout-api/src/utils/files.rs | 2 +- ffplayout-engine/Cargo.toml | 2 +- ffplayout-engine/src/main.rs | 2 +- ffplayout-engine/src/rpc/mod.rs | 2 +- lib/Cargo.toml | 2 +- lib/src/filter/v_drawtext.rs | 2 +- lib/src/utils/mod.rs | 4 +-- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a470ac61..67288f42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -362,9 +362,9 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", @@ -377,16 +377,16 @@ dependencies = [ [[package]] name = "async-io" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" +checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" dependencies = [ + "async-lock", "autocfg", "concurrent-queue", "futures-lite", "libc", "log", - "once_cell", "parking", "polling", "slab", @@ -609,9 +609,9 @@ checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" dependencies = [ "jobserver", ] @@ -921,9 +921,9 @@ dependencies = [ [[package]] name = "email_address" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b32a7a2580c4473f10f66b512c34bdd7d33c5e3473227ca833abdb5afe4809" +checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" [[package]] name = "encoding_rs" @@ -962,7 +962,7 @@ dependencies = [ [[package]] name = "ffplayout" -version = "0.16.2" +version = "0.16.3" dependencies = [ "chrono", "clap", @@ -982,7 +982,7 @@ dependencies = [ [[package]] name = "ffplayout-api" -version = "0.7.0" +version = "0.7.1" dependencies = [ "actix-files", "actix-multipart", @@ -1012,7 +1012,7 @@ dependencies = [ [[package]] name = "ffplayout-lib" -version = "0.16.2" +version = "0.16.3" dependencies = [ "chrono", "crossbeam-channel", @@ -1430,9 +1430,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064" dependencies = [ "bytes", "futures-channel", @@ -1467,9 +1467,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.51" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1895,9 +1895,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2001,9 +2001,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" @@ -2039,9 +2039,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.22.0+1.1.1q" +version = "111.24.0+1.1.1s" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd" dependencies = [ "cc", ] @@ -2062,9 +2062,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" [[package]] name = "paris" diff --git a/ffplayout-api/Cargo.toml b/ffplayout-api/Cargo.toml index 5f44c3ab..2b1a11f4 100644 --- a/ffplayout-api/Cargo.toml +++ b/ffplayout-api/Cargo.toml @@ -4,7 +4,7 @@ description = "Rest API for ffplayout" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.7.0" +version = "0.7.1" edition = "2021" [dependencies] diff --git a/ffplayout-api/src/api/routes.rs b/ffplayout-api/src/api/routes.rs index b0b6950d..ffc78ef9 100644 --- a/ffplayout-api/src/api/routes.rs +++ b/ffplayout-api/src/api/routes.rs @@ -792,7 +792,7 @@ async fn import_playlist( obj: web::Query, ) -> Result { let file = Path::new(&obj.file).file_name().unwrap_or_default(); - let path = env::temp_dir().join(&file).to_string_lossy().to_string(); + let path = env::temp_dir().join(file).to_string_lossy().to_string(); let (config, _) = playout_config(&id).await?; let channel = handles::select_channel(&id).await?; diff --git a/ffplayout-api/src/utils/files.rs b/ffplayout-api/src/utils/files.rs index e5db7027..da86e138 100644 --- a/ffplayout-api/src/utils/files.rs +++ b/ffplayout-api/src/utils/files.rs @@ -178,7 +178,7 @@ pub async fn create_directory( // } fn rename(source: &PathBuf, target: &PathBuf) -> Result { - match fs::rename(&source, &target) { + match fs::rename(source, target) { Ok(_) => Ok(MoveObject { source: source .file_name() diff --git a/ffplayout-engine/Cargo.toml b/ffplayout-engine/Cargo.toml index 06ec1642..ed774bba 100644 --- a/ffplayout-engine/Cargo.toml +++ b/ffplayout-engine/Cargo.toml @@ -4,7 +4,7 @@ description = "24/7 playout based on rust and ffmpeg" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.16.2" +version = "0.16.3" edition = "2021" default-run = "ffplayout" diff --git a/ffplayout-engine/src/main.rs b/ffplayout-engine/src/main.rs index f90ea2a1..e7300a8e 100644 --- a/ffplayout-engine/src/main.rs +++ b/ffplayout-engine/src/main.rs @@ -60,7 +60,7 @@ fn status_file(stat_file: &str, playout_stat: &PlayoutStatus) { let stat_file = File::options() .read(true) .write(false) - .open(&stat_file) + .open(stat_file) .expect("Could not open status file"); let data: StatusData = diff --git a/ffplayout-engine/src/rpc/mod.rs b/ffplayout-engine/src/rpc/mod.rs index af3981f4..ed103fb3 100644 --- a/ffplayout-engine/src/rpc/mod.rs +++ b/ffplayout-engine/src/rpc/mod.rs @@ -171,7 +171,7 @@ pub fn json_rpc_server( let filter = filter_from_json(map["message"].clone()); debug!("Got drawtext command: \"{filter}\""); - // TODO: in Rust 1.65 use let_chains instead + // TODO: in Rust 1.66 use let_chains instead if !filter.is_empty() && config.text.zmq_stream_socket.is_some() { if let Some(clips_filter) = playout_stat.chain.clone() { *clips_filter.lock().unwrap() = vec![filter.clone()]; diff --git a/lib/Cargo.toml b/lib/Cargo.toml index ab8b3f4a..4c02bcb2 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -4,7 +4,7 @@ description = "Library for ffplayout" license = "GPL-3.0" authors = ["Jonathan Baecker jonbae77@gmail.com"] readme = "README.md" -version = "0.16.2" +version = "0.16.3" edition = "2021" [dependencies] diff --git a/lib/src/filter/v_drawtext.rs b/lib/src/filter/v_drawtext.rs index 5827ed90..014adc61 100644 --- a/lib/src/filter/v_drawtext.rs +++ b/lib/src/filter/v_drawtext.rs @@ -25,7 +25,7 @@ pub fn filter_node( _ => config.text.zmq_stream_socket.clone(), }; - // TODO: in Rust 1.65 use let_chains instead + // TODO: in Rust 1.66 use let_chains instead if config.text.text_from_filename && node.is_some() { let source = node.unwrap_or(&Media::new(0, "", false)).source.clone(); let text = match Regex::new(&config.text.regex) diff --git a/lib/src/utils/mod.rs b/lib/src/utils/mod.rs index 6a54dd23..edd2559a 100644 --- a/lib/src/utils/mod.rs +++ b/lib/src/utils/mod.rs @@ -265,7 +265,7 @@ pub fn fps_calc(r_frame_rate: &str, default: f64) -> f64 { } pub fn json_reader(path: &PathBuf) -> Result { - let f = File::options().read(true).write(false).open(&path)?; + let f = File::options().read(true).write(false).open(path)?; let p = serde_json::from_reader(f)?; Ok(p) @@ -276,7 +276,7 @@ pub fn json_writer(path: &PathBuf, data: JsonPlaylist) -> Result<(), Error> { .write(true) .truncate(true) .create(true) - .open(&path)?; + .open(path)?; serde_json::to_writer_pretty(f, &data)?; Ok(())