From 276b6d794a9ca18695ff388f7083be24cbecbb2b Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Mon, 3 Jun 2024 16:58:28 +0200 Subject: [PATCH] clippy: fix errors found locally We should investigate why some errors were not found in CI tasks, though. --- bindings/matrix-sdk-ffi/src/client_builder.rs | 2 +- crates/matrix-sdk-base/src/sliding_sync.rs | 6 +++--- crates/matrix-sdk-ui/tests/integration/sliding_sync.rs | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bindings/matrix-sdk-ffi/src/client_builder.rs b/bindings/matrix-sdk-ffi/src/client_builder.rs index b25dcee1f4c..329266b4eaf 100644 --- a/bindings/matrix-sdk-ffi/src/client_builder.rs +++ b/bindings/matrix-sdk-ffi/src/client_builder.rs @@ -425,7 +425,7 @@ impl ClientBuilder { random_dir .to_str() .expect("The base path and the uuid both are valid UTF-8 strings") - .to_string(), + .to_owned(), ); Some((base_directory, random_dir)) diff --git a/crates/matrix-sdk-base/src/sliding_sync.rs b/crates/matrix-sdk-base/src/sliding_sync.rs index cfaf3fada4a..d8bbdb66563 100644 --- a/crates/matrix-sdk-base/src/sliding_sync.rs +++ b/crates/matrix-sdk-base/src/sliding_sync.rs @@ -1296,11 +1296,11 @@ mod tests { room.heroes = Some(vec![ assign!(v4::SlidingSyncRoomHero::default(), { user_id: Some(gordon), - name: Some("Gordon".to_string()), + name: Some("Gordon".to_owned()), }), assign!(v4::SlidingSyncRoomHero::default(), { user_id: Some(alice), - name: Some("Alice".to_string()), + name: Some("Alice".to_owned()), }), ]); let response = response_with_room(room_id, room).await; @@ -1315,7 +1315,7 @@ mod tests { // And heroes are part of the summary. assert_eq!( client_room.clone_info().summary.heroes(), - &["@gordon:e.uk".to_string(), "@alice:e.uk".to_string()] + &["@gordon:e.uk".to_owned(), "@alice:e.uk".to_owned()] ); } diff --git a/crates/matrix-sdk-ui/tests/integration/sliding_sync.rs b/crates/matrix-sdk-ui/tests/integration/sliding_sync.rs index d0eed1e4cac..65801279388 100644 --- a/crates/matrix-sdk-ui/tests/integration/sliding_sync.rs +++ b/crates/matrix-sdk-ui/tests/integration/sliding_sync.rs @@ -122,7 +122,10 @@ macro_rules! sliding_sync_then_assert_request_and_fake_response { &json!({ $( $request_json )* }), $crate::sliding_sync_then_assert_request_and_fake_response!(@assertion_config $sign) ) { - dbg!(json_value); + #[allow(clippy::dbg_macro)] + { + dbg!(json_value); + } panic!("{error}"); }