fix: Clippy lints 1.57.0

relay-cabi/src/ffi.rs

@@ -99,8 +99,7 @@ pub extern "C" fn relay_init() {
 /// If there is no error, 0 is returned.
 #[no_mangle]
 pub extern "C" fn relay_err_get_last_code() -> RelayErrorCode {
-    relay_ffi::with_last_error(|err| RelayErrorCode::from_error(err))
-        .unwrap_or(RelayErrorCode::NoError)
+    relay_ffi::with_last_error(RelayErrorCode::from_error).unwrap_or(RelayErrorCode::NoError)
 }
 
 /// Returns the last error message.

relay-common/src/glob.rs

@@ -12,7 +12,7 @@ lazy_static! {
 }
 
 /// Controls the options of the globber.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
 pub struct GlobOptions {
     /// When enabled `**` matches over path separators and `*` does not.
     pub double_star: bool,
@@ -24,17 +24,6 @@ pub struct GlobOptions {
     pub allow_newline: bool,
 }
 
-impl Default for GlobOptions {
-    fn default() -> GlobOptions {
-        GlobOptions {
-            double_star: false,
-            case_insensitive: false,
-            path_normalize: false,
-            allow_newline: false,
-        }
-    }
-}
-
 fn translate_pattern(pat: &str, options: GlobOptions) -> Option<Regex> {
     let mut builder = GlobBuilder::new(pat);
     builder.case_insensitive(options.case_insensitive);

relay-crash/src/lib.rs

@@ -18,6 +18,7 @@ mod native {
 /// Internally, this uses the Breakpad client to capture crash signals and send minidumps to Sentry.
 /// If no DSN is configured, the crash handler is not initialized.
 #[derive(Debug, Default)]
+#[cfg_attr(not(unix), allow(dead_code))]
 pub struct CrashHandler<'a> {
     dsn: &'a str,
     database: &'a str,

relay-general/src/pii/processor.rs

@@ -50,6 +50,7 @@ impl<'a> PiiProcessor<'a> {
 
         for (selector, rules) in self.compiled_config.applications.iter() {
             if state.path().matches_selector(selector) {
+                #[allow(clippy::needless_option_as_deref)]
                 for rule in rules {
                     let reborrowed_value = value.as_deref_mut();
                     apply_rule_to_value(meta, rule, state.path().key(), reborrowed_value)?;

relay-general/src/protocol/security_report.rs

@@ -226,9 +226,8 @@ impl CspRaw {
         }
 
         self.violated_directive
-            .splitn(2, ' ')
-            .next()
-            .and_then(|v| v.parse().ok())
+            .split_once(' ')
+            .and_then(|(v, _)| v.parse().ok())
             .ok_or(InvalidSecurityError)
     }
 
@@ -364,7 +363,7 @@ impl CspRaw {
             None => "",
         };
 
-        match original_uri.splitn(2, ':').next().unwrap_or_default() {
+        match original_uri.split_once(':').unwrap_or_default().0 {
             "http" | "https" => Cow::Borrowed(value),
             scheme => Cow::Owned(unsplit_uri(scheme, value)),
         }

relay-quotas/src/quota.rs

@@ -260,7 +260,7 @@ impl Quota {
     ///  - The quota only applies to `Unknown` data categories.
     ///  - The quota is counted (not limit `0`) but specifies categories with different units.
     pub fn is_valid(&self) -> bool {
-        let mut units = self.categories.iter().filter_map(|c| CategoryUnit::from(c));
+        let mut units = self.categories.iter().filter_map(CategoryUnit::from);
 
         match units.next() {
             // There are only unknown categories, which is always invalid

tools/generate-schema/src/main.rs

@@ -62,11 +62,15 @@ struct Cli {
 
 impl Cli {
     pub fn run(self) -> Result<()> {
-        let schema = relay_general::protocol::event_json_schema();
-
-        match self.output {
-            Some(path) => serde_json::to_writer_pretty(File::create(path)?, &schema)?,
-            None => serde_json::to_writer_pretty(io::stdout(), &schema)?,
+        match self.format {
+            SchemaFormat::JsonSchema => {
+                let schema = relay_general::protocol::event_json_schema();
+
+                match self.output {
+                    Some(path) => serde_json::to_writer_pretty(File::create(path)?, &schema)?,
+                    None => serde_json::to_writer_pretty(io::stdout(), &schema)?,
+                }
+            }
         }
 
         Ok(())