fix(telemetry): correct clippy warnings

vercel · Dec 8, 2023 · 65276e7 · 65276e7
1 parent 4b338fc
commit 65276e7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/crates/turborepo-lib/src/commands/telemetry.rs b/crates/turborepo-lib/src/commands/telemetry.rs
@@ -39,7 +39,7 @@ pub fn configure(command: &Option<Box<TelemetryCommand>>, base: &mut CommandBase
         Ok(config) => config,
         Err(e) => {
             log_error("Failed to load telemetry config", &e.to_string(), base);
-            return ();
+            return;
         }
     };
 
@@ -68,6 +68,4 @@ pub fn configure(command: &Option<Box<TelemetryCommand>>, base: &mut CommandBase
             log_status(config, base);
         }
     }
-
-    ()
 }
diff --git a/crates/turborepo-telemetry/src/client.rs b/crates/turborepo-telemetry/src/client.rs
@@ -60,7 +60,7 @@ impl AnonAPIClient {
 
         let request_builder = self
             .client
-            .request(method, &url)
+            .request(method, url)
             .header("User-Agent", self.user_agent.clone())
             .header("Content-Type", "application/json")
             .header("x-turbo-telemetry-id", telemetry_id)

diff --git a/crates/turborepo-telemetry/src/config.rs b/crates/turborepo-telemetry/src/config.rs
@@ -57,7 +57,7 @@ fn write_new_config() -> Result<(), ConfigError> {
 
 pub fn is_debug() -> bool {
     let debug = env::var(DEBUG_ENV_VAR).unwrap_or("0".to_string());
-    return debug == "1" || debug == "true";
+    debug == "1" || debug == "true"
 }
 
 impl TelemetryConfig {
@@ -74,15 +74,16 @@ impl TelemetryConfig {
 
         let settings = settings.build();
 
-        // Check if this is a FileParse error, remove the config file and write a new
-        // one, otherwise return the error
+        // If this is a FileParse error, we assume something corrupted the file or
+        // structure. In this case, try to remove the config file and write a
+        // new one, otherwise return the error
         if let Err(ConfigError::FileParse { .. }) = settings {
             fs::remove_file(file_path).map_err(|e| ConfigError::Message(e.to_string()))?;
             write_new_config()?;
             return Err(settings.unwrap_err());
-        } else if settings.is_err() {
+        } else if let Err(err) = settings {
             // Propagate other errors
-            return Err(settings.unwrap_err());
+            return Err(err);
         }
 
         // this is safe because we just checked the error case above
@@ -107,7 +108,7 @@ impl TelemetryConfig {
         Ok(())
     }
 
-    pub fn show_alert(&mut self) -> () {
+    pub fn show_alert(&mut self) {
         if !self.has_seen_alert() && self.is_enabled() {
             println!(
                 "\n{}\n{}\n{}\n{}\n{}\n",
@@ -137,7 +138,6 @@ impl TelemetryConfig {
                 ),
             }
         }
-        ()
     }
 
     // getters
@@ -168,13 +168,13 @@ impl TelemetryConfig {
     pub fn enable(&mut self) -> Result<&TelemetryConfigContents, ConfigError> {
         self.config.telemetry_enabled = true;
         self.write()?;
-        return Ok(&self.config);
+        Ok(&self.config)
     }
 
     pub fn disable(&mut self) -> Result<&TelemetryConfigContents, ConfigError> {
         self.config.telemetry_enabled = false;
         self.write()?;
-        return Ok(&self.config);
+        Ok(&self.config)
     }
 
     pub fn alert_shown(&mut self) -> Result<&TelemetryConfigContents, ConfigError> {
@@ -183,7 +183,7 @@ impl TelemetryConfig {
             false => {
                 self.config.telemetry_alerted = Some(Utc::now());
                 self.write()?;
-                return Ok(&self.config);
+                Ok(&self.config)
             }
         }
     }

diff --git a/crates/turborepo-telemetry/src/lib.rs b/crates/turborepo-telemetry/src/lib.rs
@@ -57,7 +57,7 @@ pub struct TelemetryHandle {
 static SENDER_INSTANCE: OnceCell<TelemetrySender> = OnceCell::new();
 
 // A global instance of the TelemetrySender.
-pub fn telem(event: events::TelemetryEvent) -> () {
+pub fn telem(event: events::TelemetryEvent) {
     let sender = SENDER_INSTANCE.get();
     match sender {
         Some(s) => {
@@ -218,7 +218,6 @@ impl<C: telemetry::TelemetryClient + Clone + Send + Sync + 'static> Worker<C> {
             for event in &events {
                 let pretty_event = serde_json::to_string_pretty(&event)
                     .unwrap_or("Error serializing event".to_string());
-                println!("");
                 println!(
                     "\n{}\n{}\n",
                     self.ui.apply(BOLD.apply_to("[telemetry event]")),