Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Enforce Rust unwrap lint with scoped exceptions

Manav Rathif526bf8cbf46
diff --git a/.github/checks/change-approval/check.mjs b/.github/checks/change-approval/check.mjs
index f79699e6c0..a1a19a19c9 100644
--- a/.github/checks/change-approval/check.mjs
+++ b/.github/checks/change-approval/check.mjs
@@ -23,7 +23,7 @@ const guardrailFiles = new Set([
"analysis_options.yaml",
]);
const configFile =
- /(^|\/)(\.gitattributes|rust-toolchain\.toml|\.cargo\/(config|audit)\.toml|\.npmrc|\.nvmrc|\.tool-versions|\.node-version|\.python-version|gradle-wrapper\.properties)$/;
+ /(^|\/)(\.gitattributes|\.?clippy\.toml|rust-toolchain\.toml|\.cargo\/(config|audit)\.toml|\.npmrc|\.nvmrc|\.tool-versions|\.node-version|\.python-version|gradle-wrapper\.properties)$/;
const cargoLints = (source) =>
execFileSync("python3", ["-c", `
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index b3f22281e7..9b9f0b2769 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -140,6 +140,7 @@ uninlined_format_args = "deny"
unused_async = "deny"
unused_peekable = "deny"
unused_rounding = "deny"
+unwrap_used = "deny"
# Unoptimized Argon2 makes production-strength derivations dominate test runtime.
[profile.dev.package.argon2]
diff --git a/rust/bindings/frb/locker/src/lib.rs b/rust/bindings/frb/locker/src/lib.rs
index 9f94577e8e..f2425a0527 100644
--- a/rust/bindings/frb/locker/src/lib.rs
+++ b/rust/bindings/frb/locker/src/lib.rs
@@ -5,7 +5,8 @@ pub mod api;
unsafe_code,
clippy::allow_attributes,
clippy::allow_attributes_without_reason,
- reason = "Flutter Rust Bridge generates unsafe bindings and allow attributes without reasons"
+ clippy::unwrap_used,
+ reason = "Flutter Rust Bridge generates unsafe bindings, unwrap calls and allow attributes without reasons"
)]
#[rustfmt::skip]
mod frb_generated;
diff --git a/rust/bindings/frb/photos/src/lib.rs b/rust/bindings/frb/photos/src/lib.rs
index 9f94577e8e..f2425a0527 100644
--- a/rust/bindings/frb/photos/src/lib.rs
+++ b/rust/bindings/frb/photos/src/lib.rs
@@ -5,7 +5,8 @@ pub mod api;
unsafe_code,
clippy::allow_attributes,
clippy::allow_attributes_without_reason,
- reason = "Flutter Rust Bridge generates unsafe bindings and allow attributes without reasons"
+ clippy::unwrap_used,
+ reason = "Flutter Rust Bridge generates unsafe bindings, unwrap calls and allow attributes without reasons"
)]
#[rustfmt::skip]
mod frb_generated;
diff --git a/rust/clippy.toml b/rust/clippy.toml
new file mode 100644
index 0000000000..154626ef4e
--- /dev/null
+++ b/rust/clippy.toml
@@ -0,0 +1 @@
+allow-unwrap-in-tests = true
diff --git a/rust/crates/accounts/tests/accounts.rs b/rust/crates/accounts/tests/accounts.rs
index 8af901b324..72dd5ac4e9 100644
--- a/rust/crates/accounts/tests/accounts.rs
+++ b/rust/crates/accounts/tests/accounts.rs
@@ -1,3 +1,4 @@
+#![cfg(test)]
#![cfg(feature = "museum")]
use std::time::{SystemTime, UNIX_EPOCH};
diff --git a/rust/crates/contacts/tests/contacts.rs b/rust/crates/contacts/tests/contacts.rs
index 3bb3b899c9..14eb03e6be 100644
--- a/rust/crates/contacts/tests/contacts.rs
+++ b/rust/crates/contacts/tests/contacts.rs
@@ -1,3 +1,4 @@
+#![cfg(test)]
#![cfg(feature = "museum")]
mod support;
diff --git a/rust/crates/contacts/tests/contacts_mock.rs b/rust/crates/contacts/tests/contacts_mock.rs
index f1134cf7c5..b0e045a153 100644
--- a/rust/crates/contacts/tests/contacts_mock.rs
+++ b/rust/crates/contacts/tests/contacts_mock.rs
@@ -1,3 +1,5 @@
+#![cfg(test)]
+
use std::sync::RwLock;
use ente_contacts::{
diff --git a/rust/crates/ensu/src/db/chat/mod.rs b/rust/crates/ensu/src/db/chat/mod.rs
index f35559fc31..cb1474430e 100644
--- a/rust/crates/ensu/src/db/chat/mod.rs
+++ b/rust/crates/ensu/src/db/chat/mod.rs
@@ -438,7 +438,8 @@ fn parse_stored_attachments(raw: Option<String>) -> Result<Vec<StoredAttachment>
}
}
-#[cfg(all(test, feature = "sqlite"))]
+#[cfg(test)]
+#[cfg(feature = "sqlite")]
mod tests {
use std::collections::VecDeque;
use std::sync::atomic::{AtomicI64, Ordering};
diff --git a/rust/crates/exif/tests/integration/main.rs b/rust/crates/exif/tests/integration/main.rs
index 1009451155..1401c90655 100644
--- a/rust/crates/exif/tests/integration/main.rs
+++ b/rust/crates/exif/tests/integration/main.rs
@@ -1,3 +1,5 @@
+#![cfg(test)]
+
mod common;
mod capture;
diff --git a/rust/crates/space/tests/space.rs b/rust/crates/space/tests/space.rs
index 279ddb5014..b26522d4a2 100644
--- a/rust/crates/space/tests/space.rs
+++ b/rust/crates/space/tests/space.rs
@@ -1,3 +1,4 @@
+#![cfg(test)]
#![cfg(feature = "museum")]
mod support;