Clippy

nyx-space · Dec 22, 2024 · 7c8c403 · 7c8c403
1 parent 82314cc
commit 7c8c403
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -54,7 +54,6 @@ jobs:
           wget -O data/variable-seg-size-hermite.bsp http://public-data.nyxspace.com/anise/ci/variable-seg-size-hermite.bsp
           wget -O data/earth_latest_high_prec.bpc http://public-data.nyxspace.com/anise/ci/earth_latest_high_prec-2023-09-08.bpc
           wget -O data/lro.bsp http://public-data.nyxspace.com/nyx/examples/lrorg_2023349_2024075_v01_LE.bsp
-          wget -O data/moon_pa_de440_200625.bpc http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -194,6 +193,8 @@ jobs:
           wget -O data/variable-seg-size-hermite.bsp http://public-data.nyxspace.com/anise/ci/variable-seg-size-hermite.bsp
           wget -O data/earth_latest_high_prec.bpc http://public-data.nyxspace.com/anise/ci/earth_latest_high_prec-2023-09-08.bpc
           wget -O data/lro.bsp http://public-data.nyxspace.com/nyx/examples/lrorg_2023349_2024075_v01_LE.bsp
+          wget -O data/moon_fk_de440.epa http://public-data.nyxspace.com/anise/v0.5/moon_fk_de440.epa
+          wget -O data/moon_pa_de440_200625.bpc http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc
 
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable

diff --git a/anise/src/almanac/mod.rs b/anise/src/almanac/mod.rs
@@ -130,7 +130,7 @@ impl Almanac {
             if let Ok(fileid) = file_record.identification() {
                 return match fileid {
                     "PCK" => {
-                        info!("Loading {} as DAF/PCK", path.or(Some("bytes")).unwrap());
+                        info!("Loading {} as DAF/PCK", path.unwrap_or("bytes"));
                         let bpc = BPC::parse(bytes)
                             .context(BPCSnafu {
                                 action: "parsing bytes",
@@ -143,7 +143,7 @@ impl Almanac {
                         })
                     }
                     "SPK" => {
-                        info!("Loading {} as DAF/SPK", path.or(Some("bytes")).unwrap());
+                        info!("Loading {} as DAF/SPK", path.unwrap_or("bytes"));
                         let spk = SPK::parse(bytes)
                             .context(SPKSnafu {
                                 action: "parsing bytes",
@@ -176,7 +176,7 @@ impl Almanac {
                     })?;
                     info!(
                         "Loading {} as ANISE spacecraft data",
-                        path.or(Some("bytes")).unwrap()
+                        path.unwrap_or("bytes")
                     );
                     Ok(self.with_spacecraft_data(dataset))
                 }
@@ -187,7 +187,7 @@ impl Almanac {
                             action: "loading as planetary data",
                         }
                     })?;
-                    info!("Loading {} as ANISE/PCA", path.or(Some("bytes")).unwrap());
+                    info!("Loading {} as ANISE/PCA", path.unwrap_or("bytes"));
                     Ok(self.with_planetary_data(dataset))
                 }
                 DataSetType::EulerParameterData => {
@@ -197,7 +197,7 @@ impl Almanac {
                             action: "loading Euler parameters",
                         }
                     })?;
-                    info!("Loading {} as ANISE/EPA", path.or(Some("bytes")).unwrap());
+                    info!("Loading {} as ANISE/EPA", path.unwrap_or("bytes"));
                     Ok(self.with_euler_parameters(dataset))
                 }
             }