Skip to content

clippy: fix extra errors and enforce target-applies-to-host in xtask #3497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 5, 2024
Merged

clippy: fix extra errors and enforce target-applies-to-host in xtask #3497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adff571
xtask: force --target-applies-to-host when running Clippy check
bnjbvr Jun 3, 2024
313af41
clippy: fix additional errors
bnjbvr Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bindings/matrix-sdk-ffi/src/client_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
6 changes: 3 additions & 3 deletions crates/matrix-sdk-base/src/sliding_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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()]
);
}

Expand Down
5 changes: 4 additions & 1 deletion crates/matrix-sdk-ui/tests/integration/sliding_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
}

Expand Down
7 changes: 7 additions & 0 deletions xtask/src/ci.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,20 +179,27 @@ fn check_typos() -> Result<()> {

fn check_clippy() -> Result<()> {
cmd!("rustup run {NIGHTLY} cargo clippy --all-targets --features testing -- -D warnings")
// Work around https://github.com/rust-lang/cargo/issues/10744
.env("CARGO_TARGET_APPLIES_TO_HOST", "true")
.run()?;

cmd!(
"rustup run {NIGHTLY} cargo clippy --workspace --all-targets
--exclude matrix-sdk-crypto --exclude xtask
--no-default-features
--features native-tls,experimental-sliding-sync,sso-login,testing
-- -D warnings"
)
.env("CARGO_TARGET_APPLIES_TO_HOST", "true")
.run()?;

cmd!(
"rustup run {NIGHTLY} cargo clippy --all-targets -p matrix-sdk-crypto
--no-default-features -- -D warnings"
)
.env("CARGO_TARGET_APPLIES_TO_HOST", "true")
.run()?;

Ok(())
}

Expand Down
Loading