Fix new clippy lints (#2096)

src/api/data_types/chunking/upload/options.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)] // `hash_algorithm` is never used
+
 use serde::Deserialize;
 
 use super::{ChunkCompression, ChunkHashAlgorithm, ChunkUploadCapability};

src/api/mod.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)] // a ton of fields might be unused
+
 //! This module implements the API access to the Sentry API as well
 //! as some other APIs we interact with.  In particular it can talk
 //! to the GitHub API to figure out if there are new releases of the

src/commands/events/list.rs

@@ -63,7 +63,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
 
     let max_rows = std::cmp::min(
         events.len(),
-        *matches.get_one("max_rows").unwrap_or(&std::usize::MAX),
+        *matches.get_one("max_rows").unwrap_or(&usize::MAX),
     );
 
     if let Some(events) = events.get(..max_rows) {

src/commands/issues/list.rs

@@ -56,7 +56,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
 
     let max_rows = std::cmp::min(
         issues.len(),
-        *matches.get_one("max_rows").unwrap_or(&std::usize::MAX),
+        *matches.get_one("max_rows").unwrap_or(&usize::MAX),
     );
 
     if let Some(issues) = issues.get(..max_rows) {

src/commands/organizations/list.rs

@@ -47,7 +47,7 @@ pub fn execute(_matches: &ArgMatches) -> Result<()> {
             .add(&organization.id)
             .add(&organization.name)
             .add(&organization.slug)
-            .add(&organization.date_created.format("%F"))
+            .add(organization.date_created.format("%F"))
             .add(organization.is_early_adopter)
             .add(organization.require_2fa);
     }

src/utils/dif_upload.rs

@@ -906,6 +906,7 @@ fn collect_object_dif<'a>(
         // We retain the buffer and the borrowed object in a new SelfCell. This is
         // incredibly unsafe, but in our case it is fine, since the SelfCell owns the same
         // buffer that was used to retrieve the object.
+        #[allow(clippy::missing_transmute_annotations)]
         let cell = unsafe {
             SelfCell::from_raw(
                 buffer.clone(),

src/utils/file_upload.rs

@@ -673,7 +673,7 @@ mod tests {
         let hash = Sha1::from(buf);
         assert_eq!(
             hash.digest().to_string(),
-            "d38fb9915de70eec2aa2d0c380b344d89ef540f0"
+            "f0e25ae149b711c510148e022ebc883ad62c7c4c"
         );
     }
 }

src/utils/sourcemaps/inject.rs

@@ -24,7 +24,7 @@ lazy_static! {
     // 2. a block of line comments, block comments, and empty lines,
     // 3. and an optional `"use strict";` statement.`
     static ref PRE_INJECT_RE: Regex = Regex::new(
-        r#"^(#!.*[\n\r])?(?:\s*|/\*(?:.|\r|\n)*?\*/|//.*[\n\r])*(?:"[^"]*";|'[^']*';[\n\r]?)?"#
+        r#"^(#!.*[\n\r])?(?:\s+|/\*(?:.|\r|\n)*?\*/|//.*[\n\r])*(?:"[^"]*";|'[^']*';[\n\r]?)?"#
     )
     .unwrap();
 }
@@ -109,11 +109,9 @@ impl fmt::Display for InjectReport {
 /// Fixes up a minified JS source file with a debug id.
 ///
 /// This changes the source file in several ways:
-/// 1. The source code snippet
-/// `<CODE_SNIPPET>[<debug_id>]`
-/// is inserted at the earliest possible position, which is after an
-/// optional hashbang, followed by a
-/// block of comments, empty lines, and an optional `"use […]";` or `'use […]';` pragma.
+/// 1. The source code snippet `<CODE_SNIPPET>[<debug_id>]` is inserted at the earliest possible position,
+///    which is after an optional hashbang, followed by a block of comments, empty lines,
+///    and an optional `"use […]";` or `'use […]';` pragma.
 /// 2. A comment of the form `//# debugId=<debug_id>` is appended to the file.
 ///
 /// This function returns a [`SourceMap`] that maps locations in the injected file
@@ -160,12 +158,10 @@ pub fn fixup_js_file(js_contents: &mut Vec<u8>, debug_id: DebugId) -> Result<Sou
 /// Fixes up a minified JS source file with a debug id without messing with mappings.
 ///
 /// This changes the source file in several ways:
-/// 1. The source code snippet
-/// `<CODE_SNIPPET>[<debug_id>]` is appended to the file.
+/// 1. The source code snippet `<CODE_SNIPPET>[<debug_id>]` is appended to the file.
 /// 2. A comment of the form `//# debugId=<debug_id>` is appended to the file.
-/// 3. The last source mapping comment (a comment starting with
-/// `//# sourceMappingURL=` or `//@ sourceMappingURL=`) is moved to
-/// the very end of the file, after the debug id comment from 2.
+/// 3. The last source mapping comment (a comment starting with `//# sourceMappingURL=` or `//@ sourceMappingURL=`)
+///    is moved to the very end of the file, after the debug id comment from 2.
 ///
 /// This function is useful in cases where a source file's corresponding sourcemap is
 /// not available. In such a case, [`fixup_js_file`] might mess up the mappings by inserting
@@ -327,7 +323,6 @@ some line
 something else"#;
 
         let debug_id = DebugId::default();
-
         let mut source = Vec::from(source);
 
         fixup_js_file(&mut source, debug_id).unwrap();
@@ -426,7 +421,6 @@ some line
 something else"#;
 
         let debug_id = DebugId::default();
-
         let mut source = Vec::from(source);
 
         fixup_js_file(&mut source, debug_id).unwrap();
@@ -463,7 +457,6 @@ some line
 something else"#;
 
         let debug_id = DebugId::default();
-
         let mut source = Vec::from(source);
 
         fixup_js_file(&mut source, debug_id).unwrap();

src/utils/update.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)] // a ton of functions/fields might be unused based on the `managed` feature
+
 use std::env;
 use std::fs;
 use std::io;
@@ -169,11 +171,7 @@ impl SentryCliUpdateInfo {
 pub fn get_latest_sentrycli_release() -> Result<SentryCliUpdateInfo> {
     let api = Api::current();
     Ok(SentryCliUpdateInfo {
-        latest_release: if let Ok(release) = api.get_latest_sentrycli_release() {
-            release
-        } else {
-            None
-        },
+        latest_release: api.get_latest_sentrycli_release().unwrap_or_default(),
     })
 }
 

tests/integration/_cases/send_metric/send_metric-help.trycmd

@@ -10,16 +10,11 @@ transmission errors by passing --log-level=debug or setting `SENTRY_LOG_LEVEL=de
 Usage: sentry-cli[EXE] send-metric [OPTIONS] [COMMAND]
 
 Commands:
-  increment
-          Increment a counter metric
-  distribution
-          Update a distribution metric with the provided value
-  gauge
-          Update a gauge metric with the provided value
-  set
-          Update a set metric with the provided value
-  help
-          Print this message or the help of the given subcommand(s)
+  increment     Increment a counter metric
+  distribution  Update a distribution metric with the provided value
+  gauge         Update a gauge metric with the provided value
+  set           Update a set metric with the provided value
+  help          Print this message or the help of the given subcommand(s)
 
 Options:
       --header <KEY:VALUE>