From 241d406d75922ac4491869f8421cda5c0b7e16c2 Mon Sep 17 00:00:00 2001 From: tyranron Date: Sat, 28 Jan 2023 13:55:00 +0200 Subject: [PATCH] Upgrade to 1.67 Rust - upgrade Cargo deps --- .github/workflows/ci.yml | 5 +- Cargo.lock | 107 +++++++++++++------------ Cargo.toml | 2 +- Makefile | 4 +- crates/medea-macro/src/caused.rs | 5 +- crates/medea-macro/src/dart_bridge.rs | 24 +++++- crates/medea-macro/src/dart_codegen.rs | 19 ++++- crates/medea-macro/src/lib.rs | 19 ++++- crates/medea-reactive/src/lib.rs | 6 ++ e2e/src/lib.rs | 6 ++ mock/control-api/src/lib.rs | 6 ++ mock/control-api/src/main.rs | 6 ++ proto/client-api/src/lib.rs | 6 ++ proto/control-api/build.rs | 6 ++ proto/control-api/src/lib.rs | 6 ++ src/lib.rs | 8 ++ src/media/track/remote.rs | 1 - src/platform/dart/mod.rs | 7 +- src/platform/wasm/rtc_stats.rs | 2 +- src/room.rs | 1 - 20 files changed, 172 insertions(+), 74 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f3c06498..7cbdba3f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -544,7 +544,7 @@ jobs: - name: Install linux dependencies run: | apt update - apt install -y curl xz-utils make clang + apt install -y clang curl make xz-utils - uses: dtolnay/rust-toolchain@v1 with: toolchain: stable @@ -1033,7 +1033,8 @@ jobs: ver=${{ steps.release.outputs.group2 }})" >> $GITHUB_OUTPUT - - uses: softprops/action-gh-release@v1 + - name: Create GitHub release + uses: softprops/action-gh-release@v1 with: name: ${{ steps.release.outputs.group1 }} ${{ steps.release.outputs.group2 }} body: | diff --git a/Cargo.lock b/Cargo.lock index 3fc6d39d1..354c2a436 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -70,16 +70,16 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.2.2" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c83abf9903e1f0ad9973cc4f7b9767fd5a03a583f51a5b7a339e07987cd2724" +checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", "ahash", - "base64 0.13.1", + "base64 0.21.0", "bitflags", "brotli", "bytes", @@ -101,6 +101,8 @@ dependencies = [ "rand", "sha1", "smallvec", + "tokio", + "tokio-util", "tracing", "zstd", ] @@ -130,9 +132,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" +checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" dependencies = [ "futures-core", "tokio", @@ -140,9 +142,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824" +checksum = "3e8613a75dd50cc45f473cee3c34d59ed677c0f7b44480ce3b8247d7dc519327" dependencies = [ "actix-rt", "actix-service", @@ -179,9 +181,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.2.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48f7b6534e06c7bfc72ee91db7917d4af6afe23e7d223b51e68fffbb21e96b9" +checksum = "464e0fddc668ede5f26ec1f9557a8d44eda948732f40c6b0ad79126930eb775f" dependencies = [ "actix-codec", "actix-http", @@ -220,9 +222,9 @@ dependencies = [ [[package]] name = "actix-web-actors" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31efe7896f3933ce03dd4710be560254272334bb321a18fd8ff62b1a557d9d19" +checksum = "bf6e9ccc371cfddbed7aa842256a4abc7a6dcac9f3fce392fe1d0f68cfd136b2" dependencies = [ "actix", "actix-codec", @@ -233,6 +235,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", ] [[package]] @@ -307,9 +310,9 @@ checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" [[package]] name = "android_logger" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" +checksum = "037f3e1da32ddba7770530e69258b742c15ad67bdf90e5f6b35f4b6db9a60eb7" dependencies = [ "android_log-sys", "env_logger", @@ -340,9 +343,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "async-recursion" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea" +checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" dependencies = [ "proc-macro2", "quote", @@ -372,9 +375,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1" dependencies = [ "proc-macro2", "quote", @@ -400,9 +403,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e" +checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" dependencies = [ "async-trait", "axum-core", @@ -429,9 +432,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8" +checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" dependencies = [ "async-trait", "bytes", @@ -578,9 +581,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.1" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_derive", @@ -811,9 +814,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +checksum = "322296e2f2e5af4270b54df9e85a02ff037e271af20ba3e7fe1575515dc840b8" dependencies = [ "cc", "cxxbridge-flags", @@ -823,9 +826,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +checksum = "017a1385b05d631e7875b1f151c9f012d37b53491e2a87f65bff5c262b2111d8" dependencies = [ "cc", "codespan-reporting", @@ -838,15 +841,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" +checksum = "c26bbb078acf09bc1ecda02d4223f03bdd28bd4874edcb0379138efc499ce971" [[package]] name = "cxxbridge-macro" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" +checksum = "357f40d1f06a24b60ae1fe122542c1fb05d28d32acb2aed064e84bc2ad1e252e" dependencies = [ "proc-macro2", "quote", @@ -975,9 +978,9 @@ checksum = "ca9f76bdd86dfc8d64eecb0484d02ad4cf0e6767d4682f686d1b0580b6c27f82" [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -2418,11 +2421,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -2479,9 +2482,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.6" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags", "errno", @@ -2608,9 +2611,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "7c4437699b6d34972de58652c68b98cb5b53a4199ab126db8e20ec8ded29a721" dependencies = [ "bitflags", "core-foundation", @@ -2621,9 +2624,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -2708,9 +2711,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.16" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b5b431e8907b50339b51223b97d102db8d987ced36f6e4d03621db9316c834" +checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" dependencies = [ "indexmap", "itoa", @@ -3337,9 +3340,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" @@ -3610,9 +3613,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -3718,18 +3721,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.12.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e9262a83dc741c0b0ffec209881b45dbc232c21b02a2b9cb1adb93266e41303d" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "6.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "a6cf39f730b440bab43da8fb5faf5f254574462f73f260f85f7987f32154ff17" dependencies = [ "libc", "zstd-sys", diff --git a/Cargo.toml b/Cargo.toml index 20be026da..1e951b293 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ tracerr = "0.3" url = "2.3" [target.'cfg(target_os = "android")'.dependencies] -android_logger = "0.11" +android_logger = "0.12" [target.'cfg(any(target_os = "ios", target_os = "linux", target_os = "macos", target_os = "windows"))'.dependencies] simple_logger = "4.0" diff --git a/Makefile b/Makefile index e92d37b00..747e9ba34 100644 --- a/Makefile +++ b/Makefile @@ -20,11 +20,11 @@ IMAGE_NAME := $(strip \ $(if $(call eq,$(image),medea-demo-edge),medea-demo,\ $(or $(image),medea-control-api-mock))) -RUST_VER := 1.66 +RUST_VER := 1.67 CHROME_VERSION := 104.0 FIREFOX_VERSION := 107.0.1-driver0.32.0 -CARGO_NDK_VER := 2.8.0-ndkr23b-rust$(RUST_VER) +CARGO_NDK_VER := 2.12.4-ndkr23b-rust$(RUST_VER) ANDROID_TARGETS := aarch64-linux-android \ armv7-linux-androideabi \ i686-linux-android \ diff --git a/crates/medea-macro/src/caused.rs b/crates/medea-macro/src/caused.rs index 09bdbe2e3..cce45afd9 100644 --- a/crates/medea-macro/src/caused.rs +++ b/crates/medea-macro/src/caused.rs @@ -16,9 +16,8 @@ use synstructure::{BindStyle, Structure}; /// - otherwise returns `None`. /// 3. Generate implementation of `Caused` trait for this enum with generated /// methods from step 1 and 2. -#[allow(clippy::needless_pass_by_value)] -pub(crate) fn derive(mut s: Structure<'_>) -> Result { - let error_type = error_type(&s)?; +pub(crate) fn derive(s: &mut Structure<'_>) -> Result { + let error_type = error_type(s)?; let cause_body = s.bind_with(|_| BindStyle::Move).each_variant(|v| { v.bindings().iter().find(|&bi| is_caused(bi)).map_or_else( diff --git a/crates/medea-macro/src/dart_bridge.rs b/crates/medea-macro/src/dart_bridge.rs index 1b0e57ecb..05197c9fa 100644 --- a/crates/medea-macro/src/dart_bridge.rs +++ b/crates/medea-macro/src/dart_bridge.rs @@ -64,8 +64,6 @@ impl TryFrom for ModExpander { let mut use_items = Vec::new(); let register_prefix = &module.ident; for item in parser::try_unwrap_mod_content(module.content)? { - // false positive: non_exhaustive - #[allow(clippy::wildcard_enum_match_arm)] match item { syn::Item::ForeignMod(r#mod) => { for i in r#mod.items { @@ -78,12 +76,32 @@ impl TryFrom for ModExpander { syn::Item::Use(r#use) => { use_items.push(r#use); } - _ => { + syn::Item::Const(_) + | syn::Item::Enum(_) + | syn::Item::ExternCrate(_) + | syn::Item::Fn(_) + | syn::Item::Impl(_) + | syn::Item::Macro(_) + | syn::Item::Macro2(_) + | syn::Item::Mod(_) + | syn::Item::Static(_) + | syn::Item::Struct(_) + | syn::Item::Trait(_) + | syn::Item::TraitAlias(_) + | syn::Item::Type(_) + | syn::Item::Union(_) + | syn::Item::Verbatim(_) => { return Err(syn::Error::new( item.span(), "Module contains unsupported content", )); } + _ => { + return Err(syn::Error::new( + item.span(), + "Module contains unknown content", + )); + } } } diff --git a/crates/medea-macro/src/dart_codegen.rs b/crates/medea-macro/src/dart_codegen.rs index 995f59483..6950a3dce 100644 --- a/crates/medea-macro/src/dart_codegen.rs +++ b/crates/medea-macro/src/dart_codegen.rs @@ -157,7 +157,6 @@ impl DartType { impl TryFrom for DartType { type Error = syn::Error; - #[allow(clippy::wildcard_enum_match_arm)] // false positive: non_exhaustive fn try_from(value: syn::Type) -> syn::Result { Ok(match value { syn::Type::Path(p) => { @@ -185,9 +184,25 @@ impl TryFrom for DartType { } } } - _ => { + syn::Type::Array(_) + | syn::Type::BareFn(_) + | syn::Type::Group(_) + | syn::Type::ImplTrait(_) + | syn::Type::Infer(_) + | syn::Type::Macro(_) + | syn::Type::Never(_) + | syn::Type::Paren(_) + | syn::Type::Ptr(_) + | syn::Type::Reference(_) + | syn::Type::Slice(_) + | syn::Type::TraitObject(_) + | syn::Type::Tuple(_) + | syn::Type::Verbatim(_) => { return Err(syn::Error::new(value.span(), "Unsupported type")); } + _ => { + return Err(syn::Error::new(value.span(), "Unknown type")); + } }) } } diff --git a/crates/medea-macro/src/lib.rs b/crates/medea-macro/src/lib.rs index 268952f92..188ecae32 100644 --- a/crates/medea-macro/src/lib.rs +++ b/crates/medea-macro/src/lib.rs @@ -43,6 +43,7 @@ clippy::iter_with_drain, clippy::large_include_file, clippy::lossy_float_literal, + clippy::manual_clamp, clippy::map_err_ignore, clippy::mem_forget, clippy::missing_const_for_fn, @@ -50,8 +51,10 @@ clippy::multiple_inherent_impl, clippy::mutex_atomic, clippy::mutex_integer, + clippy::needless_collect, clippy::nonstandard_macro_braces, clippy::option_if_let_else, + clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, clippy::pedantic, @@ -70,6 +73,7 @@ clippy::string_to_string, clippy::suboptimal_flops, clippy::suspicious_operation_groupings, + clippy::suspicious_xor_used_as_pow, clippy::todo, clippy::trailing_empty_array, clippy::transmute_undefined_repr, @@ -77,6 +81,8 @@ clippy::try_err, clippy::undocumented_unsafe_blocks, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, clippy::unnecessary_self_imports, clippy::unneeded_field_pattern, clippy::unused_peekable, @@ -116,7 +122,6 @@ mod enum_delegate; mod watchers; use proc_macro::TokenStream; -use synstructure::decl_derive; #[cfg(test)] use async_trait as _; @@ -482,7 +487,6 @@ pub fn watchers(_: TokenStream, input: TokenStream) -> TokenStream { .unwrap_or_else(|e| e.to_compile_error().into()) } -decl_derive!([Caused, attributes(cause)] => /// Generate implementation of `Caused` trait for errors represented as enum. /// /// # How to use @@ -539,7 +543,16 @@ decl_derive!([Caused, attributes(cause)] => /// let err = BarError::Foo(FooError::MyError(MyError {})); /// assert!(err.cause().is_some()); /// ``` -caused::derive); +#[proc_macro_derive(Caused, attributes(cause))] +pub fn derive_caused(input: TokenStream) -> TokenStream { + syn::parse::(input) + .and_then(|i| { + synstructure::Structure::try_new(&i) + .and_then(|mut s| caused::derive(&mut s)) + }) + .unwrap_or_else(|e| e.to_compile_error()) + .into() +} /// Generates code for `extern` Dart functions registration and calling. /// diff --git a/crates/medea-reactive/src/lib.rs b/crates/medea-reactive/src/lib.rs index d7ad98bec..7d8901a14 100644 --- a/crates/medea-reactive/src/lib.rs +++ b/crates/medea-reactive/src/lib.rs @@ -43,6 +43,7 @@ clippy::iter_with_drain, clippy::large_include_file, clippy::lossy_float_literal, + clippy::manual_clamp, clippy::map_err_ignore, clippy::mem_forget, clippy::missing_const_for_fn, @@ -50,8 +51,10 @@ clippy::multiple_inherent_impl, clippy::mutex_atomic, clippy::mutex_integer, + clippy::needless_collect, clippy::nonstandard_macro_braces, clippy::option_if_let_else, + clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, clippy::pedantic, @@ -70,6 +73,7 @@ clippy::string_to_string, clippy::suboptimal_flops, clippy::suspicious_operation_groupings, + clippy::suspicious_xor_used_as_pow, clippy::todo, clippy::trailing_empty_array, clippy::transmute_undefined_repr, @@ -77,6 +81,8 @@ clippy::try_err, clippy::undocumented_unsafe_blocks, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, clippy::unnecessary_self_imports, clippy::unneeded_field_pattern, clippy::unused_peekable, diff --git a/e2e/src/lib.rs b/e2e/src/lib.rs index 26d21679d..6012ced34 100644 --- a/e2e/src/lib.rs +++ b/e2e/src/lib.rs @@ -46,6 +46,7 @@ clippy::iter_with_drain, clippy::large_include_file, clippy::lossy_float_literal, + clippy::manual_clamp, clippy::map_err_ignore, clippy::mem_forget, clippy::missing_const_for_fn, @@ -53,8 +54,10 @@ clippy::multiple_inherent_impl, clippy::mutex_atomic, clippy::mutex_integer, + clippy::needless_collect, clippy::nonstandard_macro_braces, clippy::option_if_let_else, + clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, clippy::pedantic, @@ -73,6 +76,7 @@ clippy::string_to_string, clippy::suboptimal_flops, clippy::suspicious_operation_groupings, + clippy::suspicious_xor_used_as_pow, clippy::todo, clippy::trailing_empty_array, clippy::transmute_undefined_repr, @@ -80,6 +84,8 @@ clippy::try_err, clippy::undocumented_unsafe_blocks, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, clippy::unnecessary_self_imports, clippy::unneeded_field_pattern, clippy::unused_peekable, diff --git a/mock/control-api/src/lib.rs b/mock/control-api/src/lib.rs index 396109a46..748cfaa85 100644 --- a/mock/control-api/src/lib.rs +++ b/mock/control-api/src/lib.rs @@ -42,6 +42,7 @@ clippy::iter_with_drain, clippy::large_include_file, clippy::lossy_float_literal, + clippy::manual_clamp, clippy::map_err_ignore, clippy::mem_forget, clippy::missing_const_for_fn, @@ -49,8 +50,10 @@ clippy::multiple_inherent_impl, clippy::mutex_atomic, clippy::mutex_integer, + clippy::needless_collect, clippy::nonstandard_macro_braces, clippy::option_if_let_else, + clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, clippy::pedantic, @@ -69,6 +72,7 @@ clippy::string_to_string, clippy::suboptimal_flops, clippy::suspicious_operation_groupings, + clippy::suspicious_xor_used_as_pow, clippy::todo, clippy::trailing_empty_array, clippy::transmute_undefined_repr, @@ -76,6 +80,8 @@ clippy::try_err, clippy::undocumented_unsafe_blocks, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, clippy::unnecessary_self_imports, clippy::unneeded_field_pattern, clippy::unused_peekable, diff --git a/mock/control-api/src/main.rs b/mock/control-api/src/main.rs index 67f8a13fa..db7488c55 100644 --- a/mock/control-api/src/main.rs +++ b/mock/control-api/src/main.rs @@ -42,6 +42,7 @@ clippy::iter_with_drain, clippy::large_include_file, clippy::lossy_float_literal, + clippy::manual_clamp, clippy::map_err_ignore, clippy::mem_forget, clippy::missing_const_for_fn, @@ -49,8 +50,10 @@ clippy::multiple_inherent_impl, clippy::mutex_atomic, clippy::mutex_integer, + clippy::needless_collect, clippy::nonstandard_macro_braces, clippy::option_if_let_else, + clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, clippy::pedantic, @@ -69,6 +72,7 @@ clippy::string_to_string, clippy::suboptimal_flops, clippy::suspicious_operation_groupings, + clippy::suspicious_xor_used_as_pow, clippy::todo, clippy::trailing_empty_array, clippy::transmute_undefined_repr, @@ -76,6 +80,8 @@ clippy::try_err, clippy::undocumented_unsafe_blocks, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, clippy::unnecessary_self_imports, clippy::unneeded_field_pattern, clippy::unused_peekable, diff --git a/proto/client-api/src/lib.rs b/proto/client-api/src/lib.rs index a7a5b3964..f98692876 100644 --- a/proto/client-api/src/lib.rs +++ b/proto/client-api/src/lib.rs @@ -44,6 +44,7 @@ clippy::iter_with_drain, clippy::large_include_file, clippy::lossy_float_literal, + clippy::manual_clamp, clippy::map_err_ignore, clippy::mem_forget, clippy::missing_const_for_fn, @@ -51,8 +52,10 @@ clippy::multiple_inherent_impl, clippy::mutex_atomic, clippy::mutex_integer, + clippy::needless_collect, clippy::nonstandard_macro_braces, clippy::option_if_let_else, + clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, clippy::pedantic, @@ -71,6 +74,7 @@ clippy::string_to_string, clippy::suboptimal_flops, clippy::suspicious_operation_groupings, + clippy::suspicious_xor_used_as_pow, clippy::todo, clippy::trailing_empty_array, clippy::transmute_undefined_repr, @@ -78,6 +82,8 @@ clippy::try_err, clippy::undocumented_unsafe_blocks, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, clippy::unnecessary_self_imports, clippy::unneeded_field_pattern, clippy::unused_peekable, diff --git a/proto/control-api/build.rs b/proto/control-api/build.rs index efd0ebddb..bea9d49e7 100644 --- a/proto/control-api/build.rs +++ b/proto/control-api/build.rs @@ -44,6 +44,7 @@ clippy::iter_with_drain, clippy::large_include_file, clippy::lossy_float_literal, + clippy::manual_clamp, clippy::map_err_ignore, clippy::mem_forget, clippy::missing_const_for_fn, @@ -51,8 +52,10 @@ clippy::multiple_inherent_impl, clippy::mutex_atomic, clippy::mutex_integer, + clippy::needless_collect, clippy::nonstandard_macro_braces, clippy::option_if_let_else, + clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, clippy::pedantic, @@ -71,6 +74,7 @@ clippy::string_to_string, clippy::suboptimal_flops, clippy::suspicious_operation_groupings, + clippy::suspicious_xor_used_as_pow, clippy::todo, clippy::trailing_empty_array, clippy::transmute_undefined_repr, @@ -78,6 +82,8 @@ clippy::try_err, clippy::undocumented_unsafe_blocks, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, clippy::unnecessary_self_imports, clippy::unneeded_field_pattern, clippy::unused_peekable, diff --git a/proto/control-api/src/lib.rs b/proto/control-api/src/lib.rs index d16d667a3..4223c8e32 100644 --- a/proto/control-api/src/lib.rs +++ b/proto/control-api/src/lib.rs @@ -43,6 +43,7 @@ clippy::iter_with_drain, clippy::large_include_file, clippy::lossy_float_literal, + clippy::manual_clamp, clippy::map_err_ignore, clippy::mem_forget, clippy::missing_const_for_fn, @@ -50,8 +51,10 @@ clippy::multiple_inherent_impl, clippy::mutex_atomic, clippy::mutex_integer, + clippy::needless_collect, clippy::nonstandard_macro_braces, clippy::option_if_let_else, + clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, clippy::pedantic, @@ -70,6 +73,7 @@ clippy::string_to_string, clippy::suboptimal_flops, clippy::suspicious_operation_groupings, + clippy::suspicious_xor_used_as_pow, clippy::todo, clippy::trailing_empty_array, clippy::transmute_undefined_repr, @@ -77,6 +81,8 @@ clippy::try_err, clippy::undocumented_unsafe_blocks, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, clippy::unnecessary_self_imports, clippy::unneeded_field_pattern, clippy::unused_peekable, diff --git a/src/lib.rs b/src/lib.rs index c58c4c507..ba983acde 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -42,6 +42,7 @@ clippy::iter_with_drain, clippy::large_include_file, clippy::lossy_float_literal, + clippy::manual_clamp, clippy::map_err_ignore, clippy::mem_forget, clippy::missing_const_for_fn, @@ -49,8 +50,10 @@ clippy::multiple_inherent_impl, clippy::mutex_atomic, clippy::mutex_integer, + clippy::needless_collect, clippy::nonstandard_macro_braces, clippy::option_if_let_else, + clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, clippy::pedantic, @@ -69,6 +72,7 @@ clippy::string_to_string, clippy::suboptimal_flops, clippy::suspicious_operation_groupings, + clippy::suspicious_xor_used_as_pow, clippy::todo, clippy::trailing_empty_array, clippy::transmute_undefined_repr, @@ -76,6 +80,8 @@ clippy::try_err, clippy::undocumented_unsafe_blocks, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, clippy::unnecessary_self_imports, clippy::unneeded_field_pattern, clippy::unused_peekable, @@ -110,6 +116,8 @@ #![allow( clippy::module_name_repetitions, clippy::unimplemented, + clippy::unnecessary_safety_comment, + clippy::unnecessary_safety_doc, unreachable_pub )] // TODO: Remove on next `derive_more` major version. diff --git a/src/media/track/remote.rs b/src/media/track/remote.rs index 1dc6006ce..f33b406a7 100644 --- a/src/media/track/remote.rs +++ b/src/media/track/remote.rs @@ -61,7 +61,6 @@ impl Track { /// /// [1]: https://w3.org/TR/mediacapture-streams#dom-mediastreamtrack-enabled /// [2]: https://w3.org/TR/mediacapture-streams#dom-mediastreamtrack-muted - #[allow(clippy::mut_mut)] #[must_use] pub fn new( track: T, diff --git a/src/platform/dart/mod.rs b/src/platform/dart/mod.rs index a4122da1d..eaf87afc6 100644 --- a/src/platform/dart/mod.rs +++ b/src/platform/dart/mod.rs @@ -68,12 +68,13 @@ pub fn set_panic_callback(cb: Function) { } #[cfg(target_os = "android")] -/// Initializes [`android_logger`] as the default application logger with -/// minimal log level set to [`log::Level::Debug`]. +/// Initializes [`android_logger`] as the default application logger with filter +/// level set to [`log::LevelFilter::Debug`]. pub fn init_logger() { // TODO: `android_logger::init_once()` should be called only once. android_logger::init_once( - android_logger::Config::default().with_min_level(log::Level::Debug), + android_logger::Config::default() + .with_max_level(log::LevelFilter::Debug), ); } diff --git a/src/platform/wasm/rtc_stats.rs b/src/platform/wasm/rtc_stats.rs index a8b21bd74..7c809d71f 100644 --- a/src/platform/wasm/rtc_stats.rs +++ b/src/platform/wasm/rtc_stats.rs @@ -50,7 +50,7 @@ impl TryFrom<&JsValue> for RtcStats { .map_err(Rc::new) .map_err(tracerr::from_and_wrap!())?; - if let RtcStatsType::Other = &rtc_stat.stats { + if matches!(rtc_stat.stats, RtcStatsType::Other) { continue; } diff --git a/src/room.rs b/src/room.rs index 9e28a72a6..8c8714e89 100644 --- a/src/room.rs +++ b/src/room.rs @@ -817,7 +817,6 @@ pub struct Room(Rc); impl Room { /// Creates new [`Room`] and associates it with the provided [`RpcSession`]. - #[allow(clippy::mut_mut)] pub fn new( rpc: Rc, media_manager: Rc,