linting

Author: zacharyburnett

Cargo.lock

@@ -1,8 +1,8 @@
 [package]
 name = "packetraven"
-authors = ["Zach Burnett <zachary.r.burnett@gmail.com>"]
+authors = ["Zach Burnett <zrb@umd.edu>"]
 description = "track high-altitude balloon telemetry from a variety of sources"
-version = "4.0.2"
+version = "4.0.3"
 edition = "2021"
 readme = "README.md"
 license = "GPL-3.0-or-later"
@@ -28,7 +28,7 @@ geo = { version = ">=0.24.1", features = ["serde"] }
 geojson = ">=0.24.0"
 lazy_static = ">=1.4.0"
 log = ">=0.4.17"
-postgres = { version="0.19.7", optional=true }
+postgres = { version = "0.19.7", optional = true }
 ratatui = ">=0.21.0"
 crossterm = ">=0.26.1"
 regex = ">=1.8.1"
@@ -37,6 +37,6 @@ serde = ">=1.0.160"
 serde_json = ">=1.0.96"
 serde_with = { version = ">=3.0.0", features = ["chrono"] }
 serde_yaml = ">=0.9.21"
-serialport = { version= ">=4.2.0", optional=true }
+serialport = { version = ">=4.2.0", optional = true }
 url = ">=2.3.1"
 geo-types = ">=0.7.9"

Cargo.toml

@@ -64,7 +64,7 @@ impl AprsFiQuery {
             .get("https://api.aprs.fi/api/get")
             .query(&parameters)
             .send()
-            .expect(&format!("{:?}", parameters));
+            .unwrap_or_else(|_| panic!("{parameters:?}"));
         let url = response.url().to_string();
 
         self.last_access = Some(now);

src/connection/aprs_fi.rs

@@ -74,12 +74,11 @@ impl SondeHubQuery {
             for callsign in callsigns {
                 let response = client
                     .get(format!(
-                        "https://api.v2.sondehub.org/amateur/telemetry/{:}",
-                        callsign
+                        "https://api.v2.sondehub.org/amateur/telemetry/{callsign:}"
                     ))
                     .query(&parameters)
                     .send()
-                    .unwrap_or_else(|error| panic!("{:} - {:?}", error, parameters));
+                    .unwrap_or_else(|error| panic!("{error} - {parameters:?}"));
 
                 let url = response.url().to_string().to_owned();
 
@@ -90,7 +89,7 @@ impl SondeHubQuery {
                             Ok(object) => object,
                             Err(error) => {
                                 return Err(crate::connection::ConnectionError::ApiError {
-                                    message: format!("{:?}", error),
+                                    message: format!("{error:?}"),
                                     url,
                                 });
                             }
@@ -155,10 +154,7 @@ struct SondeHubLocation {
 impl SondeHubLocation {
     pub fn to_balloon_location(&self) -> crate::location::BalloonLocation {
         let aprs_packet = match self.raw.as_ref() {
-            Some(frame) => match aprs_parser::AprsPacket::decode_textual(frame.as_bytes()) {
-                Ok(packet) => Some(packet),
-                Err(_) => None,
-            },
+            Some(frame) => aprs_parser::AprsPacket::decode_textual(frame.as_bytes()).ok(),
             None => None,
         };
         let time = self.datetime.to_owned();

src/connection/sondehub.rs

@@ -192,7 +192,7 @@ impl GeoJsonFile {
                                             Err(error) => return Err(
                                                 crate::connection::ConnectionError::ReadFailure {
                                                     connection: self.path.to_owned(),
-                                                    message: format!("{:} - {:}", time, error),
+                                                    message: format!("{time} - {error}"),
                                                 },
                                             ),
                                         }
@@ -283,39 +283,6 @@ impl GeoJsonFile {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    #[ignore]
-    fn test_aprs_from_url() {
-        let url = "http://bpp.umd.edu/archives/Launches/NS-111_2022_07_31/APRS/W3EAX-11%20raw.txt"
-            .to_string();
-
-        let connection = AprsTextFile::new(url, None).unwrap();
-
-        let packets = connection.read_aprs_from_file().unwrap();
-
-        assert!(!packets.is_empty());
-    }
-
-    #[test]
-    fn test_aprs_from_file() {
-        let path = format!(
-            "{:}/{:}",
-            env!("CARGO_MANIFEST_DIR"),
-            "data/aprs/W3EAX-8_raw_NS-111.txt"
-        );
-
-        let connection = AprsTextFile::new(path, None).unwrap();
-
-        let packets = connection.read_aprs_from_file().unwrap();
-
-        assert!(!packets.is_empty());
-    }
-}
-
 pub fn locations_geojson_featurecollection(
     locations: Vec<&crate::location::BalloonLocation>,
 ) -> geojson::FeatureCollection {
@@ -359,3 +326,36 @@ pub fn locations_geojson_featurecollection(
 
     geojson::FeatureCollection::from_iter(features)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[ignore]
+    fn test_aprs_from_url() {
+        let url = "http://bpp.umd.edu/archives/Launches/NS-111_2022_07_31/APRS/W3EAX-11%20raw.txt"
+            .to_string();
+
+        let connection = AprsTextFile::new(url, None).unwrap();
+
+        let packets = connection.read_aprs_from_file().unwrap();
+
+        assert!(!packets.is_empty());
+    }
+
+    #[test]
+    fn test_aprs_from_file() {
+        let path = format!(
+            "{:}/{:}",
+            env!("CARGO_MANIFEST_DIR"),
+            "data/aprs/W3EAX-8_raw_NS-111.txt"
+        );
+
+        let connection = AprsTextFile::new(path, None).unwrap();
+
+        let packets = connection.read_aprs_from_file().unwrap();
+
+        assert!(!packets.is_empty());
+    }
+}

src/connection/text/file.rs

@@ -124,33 +124,25 @@ impl Default for AprsSerial {
     fn default() -> Self {
         match Self::new(None, None, None) {
             Ok(connection) => connection,
-            Err(error) => panic!("{:}", error),
+            Err(error) => panic!("{error}"),
         }
     }
 }
 
 fn first_available_port() -> String {
     // TODO iterate over baud rates
-    match serialport::available_ports() {
-        Ok(available_ports) => {
-            for available_port in available_ports {
-                let connection_attempt =
-                    serialport::new(available_port.port_name, *DEFAULT_BAUD_RATE).open();
-                match connection_attempt {
-                    Ok(successful) => {
-                        return successful.name().unwrap();
-                    }
-                    Err(error) => {
-                        panic!("{:}", error);
-                    }
-                }
+    let available_ports = serialport::available_ports().expect("error reading serial ports");
+    for available_port in available_ports.into_iter() {
+        match serialport::new(available_port.port_name, *DEFAULT_BAUD_RATE).open() {
+            Ok(successful) => {
+                return successful.name().unwrap();
+            }
+            Err(_) => {
+                continue;
             }
-            panic!("{:}", "no open ports");
-        }
-        Err(error) => {
-            panic!("{:}", error);
         }
     }
+    panic!("no open ports");
 }
 
 fn default_baud_rate() -> u32 {

src/connection/text/serial.rs

@@ -1,4 +1,4 @@
-use geo::GeodesicDistance;
+use geo::{Distance, Geodesic};
 
 pub type LocationTrack = Vec<crate::location::BalloonLocation>;
 
@@ -201,7 +201,7 @@ pub fn overground_distances(locations: &[super::BalloonLocation]) -> Vec<f64> {
         let current_point: geo::Point = current.location.coord.into();
         let next_point: geo::Point = next.location.coord.into();
 
-        values.push(current_point.geodesic_distance(&next_point));
+        values.push(Geodesic.distance(current_point, next_point));
 
         current = next;
         index += 1;

src/location/track/mod.rs

@@ -94,10 +94,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             let profile = prediction::FlightProfile::new(
                 ascent_rate,
                 float_altitude,
-                match float_duration {
-                    Some(seconds) => Some(chrono::Duration::seconds(seconds as i64)),
-                    None => None,
-                },
+                float_duration.map(|seconds| chrono::Duration::seconds(seconds as i64)),
                 None,
                 burst_altitude,
                 sea_level_descent_rate,

src/main.rs

@@ -66,7 +66,7 @@ impl TawhiriQuery {
                 "ascent_rate",
                 format!("{:.2}", self.query.profile.ascent_rate),
             ),
-            ("burst_altitude", format!("{:.2}", burst_altitude)),
+            ("burst_altitude", format!("{burst_altitude:.2}")),
             (
                 "descent_rate",
                 format!("{:.2}", self.query.profile.sea_level_descent_rate,),
@@ -75,13 +75,13 @@ impl TawhiriQuery {
 
         let launch_altitude = self.query.start.altitude;
         if let Some(altitude) = launch_altitude {
-            parameters.push(("launch_altitude", format!("{:.2}", altitude)));
+            parameters.push(("launch_altitude", format!("{altitude:.2}")));
         }
         if let Some(dataset_time) = self.dataset_time {
             parameters.push(("dataset", dataset_time.to_rfc3339()));
         }
         if let Some(version) = self.version {
-            parameters.push(("version", format!("{:}", version)));
+            parameters.push(("version", format!("{version}")));
         }
 
         if let Some(float_duration) = self.query.profile.float_duration {
@@ -98,7 +98,7 @@ impl TawhiriQuery {
                     }
                 }
 
-                parameters.push(("float_altitude", format!("{:.2}", float_altitude)));
+                parameters.push(("float_altitude", format!("{float_altitude:.2}")));
 
                 let float_start_time = self.query.float_start.unwrap_or({
                     self.query.start.time

src/prediction/tawhiri.rs

@@ -19,7 +19,7 @@ pub fn retrieve_locations(
     let num_new_packets = new_packets.len();
     messages.push((
         chrono::Local::now(),
-        format!("received {:} packets", num_new_packets),
+        format!("received {num_new_packets} packets"),
         log::Level::Debug,
     ));
 
@@ -72,7 +72,7 @@ pub fn retrieve_locations(
                 _ => {
                     messages.push((
                         chrono::Local::now(),
-                        format!("started track {:}", &name),
+                        format!("started track {name}"),
                         log::Level::Debug,
                     ));
                     packet_track_lengths.insert(name.to_owned(), 0);
@@ -107,18 +107,15 @@ pub fn retrieve_locations(
         if num_duplicates > 0 {
             messages.push((
                 chrono::Local::now(),
-                format!("skipped {:} duplicate packet(s)", num_duplicates),
+                format!("skipped {num_duplicates} duplicate packet(s)"),
                 log::Level::Debug,
             ));
         }
 
         if num_time_lagged_duplicates > 0 {
             messages.push((
                 chrono::Local::now(),
-                format!(
-                    "skipped {:} time-lagged duplicate packet(s)",
-                    num_time_lagged_duplicates
-                ),
+                format!("skipped {num_time_lagged_duplicates} time-lagged duplicate packet(s)"),
                 log::Level::Debug,
             ));
         }
@@ -161,7 +158,7 @@ fn location_update(track: &crate::location::track::BalloonTrack) -> String {
         &last_location.location.coord.x, &last_location.location.coord.y,
     );
     if let Some(altitude) = last_location.location.altitude {
-        message += &format!(", {:.2} m", altitude,)
+        message += &format!(", {altitude:.2} m",)
     };
     message += &String::from(")");