clippy happier

rust/src/webserver/webserver.rs

@@ -82,12 +82,10 @@ fn get_time(
 ) -> Result<Option<std::string::String>, anyhow::Error> {
     let mut board = BOARD_ACCESS.lock().unwrap();
     let native = board
-        .time()
-        .and_then(|t| Ok(t.to_rfc3339()))
+        .time().map(|t| t.to_rfc3339())
         .unwrap_or("error".to_string());
     let rtc = board
-        .get_rtc_time()
-        .and_then(|t| Ok(t.to_rfc3339()))
+        .get_rtc_time().map(|t| t.to_rfc3339())
         .unwrap_or("error".to_string());
 
     let data = LoadData {
@@ -166,7 +164,7 @@ fn get_backup_config(
 ) -> Result<Option<std::string::String>, anyhow::Error> {
     let mut board = BOARD_ACCESS.lock().unwrap();
     let json = match board.get_backup_config() {
-        Ok(config) => std::str::from_utf8(&config)?.to_owned(),
+        Ok(config) => from_utf8(&config)?.to_owned(),
         Err(err) => {
             println!("Error get backup config {:?}", err);
             err.to_string()
@@ -290,7 +288,7 @@ fn list_files(
     let board = BOARD_ACCESS.lock().unwrap();
     let result = board.list_files();
     let file_list_json = serde_json::to_string(&result)?;
-    return anyhow::Ok(Some(file_list_json));
+    anyhow::Ok(Some(file_list_json))
 }
 
 fn ota(
@@ -333,7 +331,7 @@ fn ota(
     board.set_restart_to_conf(true);
     drop(board);
     finalizer.set_as_boot_partition()?;
-    return anyhow::Ok(None);
+    anyhow::Ok(None)
 }
 
 fn flash_bq(filename: &str, dryrun: bool) -> anyhow::Result<()> {
@@ -372,7 +370,7 @@ fn flash_bq(filename: &str, dryrun: bool) -> anyhow::Result<()> {
     }
     println!("Finished flashing file {line} lines processed");
     board.general_fault(false);
-    return anyhow::Ok(());
+    anyhow::Ok(())
 }
 
 
@@ -380,12 +378,12 @@ fn flash_bq(filename: &str, dryrun: bool) -> anyhow::Result<()> {
 fn query_param(uri: &str, param_name: &str) -> Option<std::string::String> {
     println!("{uri} get {param_name}");
     let parsed = Url::parse(&format!("http://127.0.0.1/{uri}")).unwrap();
-    let value = parsed.query_pairs().filter(|it| it.0 == param_name).next();
+    let value = parsed.query_pairs().find(|it| it.0 == param_name);
     match value {
         Some(found) => {
-            return Some(found.1.into_owned());
+            Some(found.1.into_owned())
         }
-        None => return None,
+        None => None,
     }
 }
 
@@ -694,7 +692,7 @@ fn cors_response(
     let mut response = request.into_response(status, None, &headers)?;
     response.write(body.as_bytes())?;
     response.flush()?;
-    return anyhow::Ok(());
+    anyhow::Ok(())
 }
 
 type AnyhowHandler =
@@ -719,7 +717,7 @@ fn handle_error_to500(
             cors_response(request, 500, &error_text)?;
         }
     }
-    return anyhow::Ok(());
+    anyhow::Ok(())
 }
 
 fn read_up_to_bytes_from_request(