From 4783ca79b5bd68de5b24f3242425d86fa14e36b4 Mon Sep 17 00:00:00 2001 From: Theodore Zilist <14153237+tzilist@users.noreply.github.com> Date: Fri, 24 Oct 2025 14:49:37 -0700 Subject: [PATCH] clippy fixes --- Cargo.toml | 2 +- swiftnav/src/coords/ecef.rs | 1 + swiftnav/src/coords/mod.rs | 13 +-- swiftnav/src/edc.rs | 11 ++- swiftnav/src/reference_frame/mod.rs | 3 +- swiftnav/src/signal/code.rs | 1 + swiftnav/src/signal/mod.rs | 1 + swiftnav/src/time/gnss.rs | 28 +++--- swiftnav/src/time/mod.rs | 10 +- swiftnav/src/time/utc.rs | 137 ++++++++++++++-------------- swiftnav/tests/reference_frames.rs | 2 +- 11 files changed, 110 insertions(+), 99 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 13039ef..f5c4cc1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] members = [ "swiftnav", - "swiftnav-sys" + # "swiftnav-sys" ] diff --git a/swiftnav/src/coords/ecef.rs b/swiftnav/src/coords/ecef.rs index 2f71387..9774214 100644 --- a/swiftnav/src/coords/ecef.rs +++ b/swiftnav/src/coords/ecef.rs @@ -359,6 +359,7 @@ impl MulAssign<&f64> for ECEF { mod tests { use super::*; + #[expect(clippy::float_cmp)] #[test] fn ecef_ops() { let a = ECEF::new(1.0, 2.0, 3.0); diff --git a/swiftnav/src/coords/mod.rs b/swiftnav/src/coords/mod.rs index 3ba4a72..198f035 100644 --- a/swiftnav/src/coords/mod.rs +++ b/swiftnav/src/coords/mod.rs @@ -303,6 +303,7 @@ mod tests { const MAX_ANGLE_ERROR_SECS: f64 = 1e-7; const MAX_ANGLE_ERROR_RAD: f64 = (MAX_ANGLE_ERROR_SECS / 3600.0).to_radians(); + #[expect(clippy::float_cmp)] #[test] fn llhrad2deg() { let zeros = LLHRadians::default(); @@ -312,11 +313,11 @@ mod tests { assert_eq!(0.0, deg.longitude()); assert_eq!(0.0, deg.height()); - let swift_home: LLHDegrees = [37.779804, -122.391751, 60.0].into(); + let swift_home: LLHDegrees = [37.779_804, -122.391_751, 60.0].into(); let rads = swift_home.to_radians(); - assert!((rads.latitude() - 0.659381970558).abs() < MAX_ANGLE_ERROR_RAD); - assert!((rads.longitude() + 2.136139032231).abs() < MAX_ANGLE_ERROR_RAD); + assert!((rads.latitude() - 0.659_381_970_558).abs() < MAX_ANGLE_ERROR_RAD); + assert!((rads.longitude() + 2.136_139_032_231).abs() < MAX_ANGLE_ERROR_RAD); assert!( rads.height() == swift_home.height(), "rads.height() = {}, swift_home.height() = {}", @@ -339,7 +340,7 @@ mod tests { ]; /* Semi-major axis. */ - const EARTH_A: f64 = 6378137.0; + const EARTH_A: f64 = 6_378_137.0; /* Semi-minor axis. */ const EARTH_B: f64 = 6_356_752.314_245_179; @@ -404,7 +405,7 @@ mod tests { #[test] fn llh2ecef2llh() { - for llh_input in LLH_VALUES.iter() { + for llh_input in &LLH_VALUES { let llh_input: LLHRadians = llh_input.into(); let llh_output = llh_input.to_ecef().to_llh(); @@ -425,7 +426,7 @@ mod tests { #[test] fn ecef2llh2ecef() { - for ecef_input in ECEF_VALUES.iter() { + for ecef_input in &ECEF_VALUES { let ecef_input: ECEF = ecef_input.into(); let ecef_output = ecef_input.to_llh().to_ecef(); diff --git a/swiftnav/src/edc.rs b/swiftnav/src/edc.rs index 1171760..c593e3b 100644 --- a/swiftnav/src/edc.rs +++ b/swiftnav/src/edc.rs @@ -332,6 +332,7 @@ mod tests { const TEST_DATA: &[u8] = "123456789".as_bytes(); /// Helper function to append a CRC-24Q value as 3 bytes (big-endian) to a buffer + #[expect(clippy::cast_possible_truncation)] fn append_crc24q(data: &mut Vec, crc: u32) { data.push((crc >> 16) as u8); data.push((crc >> 8) as u8); @@ -365,9 +366,9 @@ mod tests { /* Test value taken from python crcmod package tests, see: * http://crcmod.sourceforge.net/crcmod.predefined.html */ - let crc = compute_crc24q(TEST_DATA, 0xB704CE); + let crc = compute_crc24q(TEST_DATA, 0x00B7_04CE); assert!( - crc == 0x21CF02, + crc == 0x0021_CF02, "CRC of \"123456789\" with init value 0xB704CE should be 0x21CF02, not {}", crc ); @@ -403,7 +404,7 @@ mod tests { #[test] fn prop_crc_stays_within_24_bits(data in prop::collection::vec(any::(), 0..1000), init in any::()) { let crc = compute_crc24q(&data, init); - prop_assert!(crc <= 0xFFFFFF, "CRC result 0x{:08X} exceeds 24-bit maximum", crc); + prop_assert!(crc <= 0x00FF_FFFF, "CRC result 0x{:08X} exceeds 24-bit maximum", crc); } /// Property: Incremental CRC calculation equals full calculation. @@ -432,10 +433,10 @@ mod tests { #[test] fn prop_crc_initial_value_masked(data in prop::collection::vec(any::(), 0..100), init in any::()) { let crc1 = compute_crc24q(&data, init); - let crc2 = compute_crc24q(&data, init & 0xFFFFFF); + let crc2 = compute_crc24q(&data, init & 0x00FF_FFFF); prop_assert_eq!(crc1, crc2, "CRC with init 0x{:08X} should equal CRC with masked init 0x{:06X}", - init, init & 0xFFFFFF); + init, init & 0x00FF_FFFF); } /// Property: Single bit errors are detected (CRC changes). diff --git a/swiftnav/src/reference_frame/mod.rs b/swiftnav/src/reference_frame/mod.rs index 9b2e95f..208e11a 100644 --- a/swiftnav/src/reference_frame/mod.rs +++ b/swiftnav/src/reference_frame/mod.rs @@ -579,6 +579,7 @@ mod tests { use params::TRANSFORMATIONS; use std::str::FromStr; + #[expect(clippy::too_many_lines)] #[test] fn reference_frame_strings() { assert_eq!(ReferenceFrame::ITRF88.to_string(), "ITRF88"); @@ -996,7 +997,7 @@ mod tests { }, }; - let params = transformation.params.clone(); + let params = transformation.params; repo.add_transformation(transformation); assert_eq!(repo.count(), 2); diff --git a/swiftnav/src/signal/code.rs b/swiftnav/src/signal/code.rs index 9b461d4..2d90814 100644 --- a/swiftnav/src/signal/code.rs +++ b/swiftnav/src/signal/code.rs @@ -455,6 +455,7 @@ mod tests { assert!(Code::AuxBds.is_bds()); } + #[expect(clippy::too_many_lines)] #[test] fn code_strings() { use std::str::FromStr; diff --git a/swiftnav/src/signal/mod.rs b/swiftnav/src/signal/mod.rs index 83c324d..e1a3c0d 100644 --- a/swiftnav/src/signal/mod.rs +++ b/swiftnav/src/signal/mod.rs @@ -133,6 +133,7 @@ impl fmt::Display for GnssSignal { mod tests { use super::*; + #[expect(clippy::too_many_lines)] #[test] fn signal_to_constellation() { assert_eq!( diff --git a/swiftnav/src/time/gnss.rs b/swiftnav/src/time/gnss.rs index 7bb6aad..4b9b9eb 100644 --- a/swiftnav/src/time/gnss.rs +++ b/swiftnav/src/time/gnss.rs @@ -742,7 +742,7 @@ mod tests { fn add_duration() { let mut t = GpsTime::new(0, 0.0).unwrap(); let t_expected = GpsTime::new(0, 1.001).unwrap(); - let d = Duration::new(1, 1000000); + let d = Duration::new(1, 1_000_000); t.add_duration(&d); assert_eq!(t, t_expected); @@ -760,7 +760,7 @@ mod tests { fn subtract_duration() { let mut t = GpsTime::new(0, 1.001).unwrap(); let t_expected = GpsTime::new(0, 0.0).unwrap(); - let d = Duration::new(1, 1000000); + let d = Duration::new(1, 1_000_000); t.subtract_duration(&d); assert_eq!(t, t_expected); @@ -783,14 +783,14 @@ mod tests { let epsilon = 1e-5; let test_cases = [ - GpsTime::new_unchecked(1234, 567890.01), - GpsTime::new_unchecked(1234, 567890.0501), - GpsTime::new_unchecked(1234, 604800.06), + GpsTime::new_unchecked(1234, 567_890.01), + GpsTime::new_unchecked(1234, 567_890.050_1), + GpsTime::new_unchecked(1234, 604_800.06), ]; let expectations = [ - GpsTime::new_unchecked(1234, 567890.00), - GpsTime::new_unchecked(1234, 567890.10), + GpsTime::new_unchecked(1234, 567_890.00), + GpsTime::new_unchecked(1234, 567_890.10), GpsTime::new_unchecked(1235, 0.1), ]; @@ -812,14 +812,14 @@ mod tests { let epsilon = 1e-6; let test_cases = [ - GpsTime::new_unchecked(1234, 567890.01), - GpsTime::new_unchecked(1234, 567890.0501), - GpsTime::new_unchecked(1234, 604800.06), + GpsTime::new_unchecked(1234, 567_890.01), + GpsTime::new_unchecked(1234, 567_890.050_1), + GpsTime::new_unchecked(1234, 604_800.06), ]; let expectations = [ - GpsTime::new_unchecked(1234, 567890.00), - GpsTime::new_unchecked(1234, 567890.00), + GpsTime::new_unchecked(1234, 567_890.00), + GpsTime::new_unchecked(1234, 567_890.00), GpsTime::new_unchecked(1235, 0.0), ]; @@ -840,7 +840,7 @@ mod tests { assert!(GalTime::new(-1, 0.0).is_err()); assert!(GalTime::new(0, -1.0).is_err()); - assert!(GalTime::new(0, consts::WEEK_SECS as f64 + 1.0).is_err()); + assert!(GalTime::new(0, f64::from(consts::WEEK_SECS) + 1.0).is_err()); } #[test] @@ -854,6 +854,6 @@ mod tests { assert!(BdsTime::new(-1, 0.0).is_err()); assert!(BdsTime::new(0, -1.0).is_err()); - assert!(BdsTime::new(0, consts::WEEK_SECS as f64 + 1.0).is_err()); + assert!(BdsTime::new(0, f64::from(consts::WEEK_SECS) + 1.0).is_err()); } } diff --git a/swiftnav/src/time/mod.rs b/swiftnav/src/time/mod.rs index f6db360..0dc0788 100644 --- a/swiftnav/src/time/mod.rs +++ b/swiftnav/src/time/mod.rs @@ -98,13 +98,13 @@ mod tests { #[test] fn conversions() { const TEST_CASES: [GpsTime; 10] = [ - GpsTime::new_unchecked(1234, 567890.0), - GpsTime::new_unchecked(1234, 567890.5), - GpsTime::new_unchecked(1234, 567890.0), + GpsTime::new_unchecked(1234, 567_890.0), + GpsTime::new_unchecked(1234, 567_890.5), + GpsTime::new_unchecked(1234, 567_890.0), GpsTime::new_unchecked(1234, 0.0), - GpsTime::new_unchecked(1000, 604578.0), + GpsTime::new_unchecked(1000, 604_578.0), GpsTime::new_unchecked(1001, 222.222), - GpsTime::new_unchecked(1001, 604578.0), + GpsTime::new_unchecked(1001, 604_578.0), GpsTime::new_unchecked(1939, 222.222), GpsTime::new_unchecked(1930, 16.0), GpsTime::new_unchecked(1930, 18.0), /* around Jan 2017 leap second */ diff --git a/swiftnav/src/time/utc.rs b/swiftnav/src/time/utc.rs index 6336a97..3547a3c 100644 --- a/swiftnav/src/time/utc.rs +++ b/swiftnav/src/time/utc.rs @@ -485,32 +485,32 @@ mod tests { let test_cases: &[UtcOffsetTestdata] = &[ /* July 1 1981 */ UtcOffsetTestdata { - t: GpsTime::new_unchecked(77, 259199.0), + t: GpsTime::new_unchecked(77, 259_199.0), d_utc: 0.0, is_lse: false, }, UtcOffsetTestdata { - t: GpsTime::new_unchecked(77, 259199.5), + t: GpsTime::new_unchecked(77, 259_199.5), d_utc: 0.0, is_lse: false, }, UtcOffsetTestdata { - t: GpsTime::new_unchecked(77, 259200.0), + t: GpsTime::new_unchecked(77, 259_200.0), d_utc: 0.0, is_lse: true, }, UtcOffsetTestdata { - t: GpsTime::new_unchecked(77, 259200.5), + t: GpsTime::new_unchecked(77, 259_200.5), d_utc: 0.0, is_lse: true, }, UtcOffsetTestdata { - t: GpsTime::new_unchecked(77, 259201.0), + t: GpsTime::new_unchecked(77, 259_201.0), d_utc: 1.0, is_lse: false, }, UtcOffsetTestdata { - t: GpsTime::new_unchecked(77, 259202.0), + t: GpsTime::new_unchecked(77, 259_202.0), d_utc: 1.0, is_lse: false, }, @@ -555,7 +555,10 @@ mod tests { let d_utc = test_case.t.gps_utc_offset_hardcoded(); let is_lse = test_case.t.is_leap_second_event_hardcoded(); - assert!(d_utc == test_case.d_utc && is_lse == test_case.is_lse, "test_case.t: {:?}, test_case.d_utc: {}, test_case.is_lse: {}, d_utc: {}, is_lse: {}", test_case.t, test_case.d_utc, test_case.is_lse, d_utc, is_lse); + #[expect(clippy::float_cmp)] + { + assert!(d_utc == test_case.d_utc && is_lse == test_case.is_lse, "test_case.t: {:?}, test_case.d_utc: {}, test_case.is_lse: {}, d_utc: {}, is_lse: {}", test_case.t, test_case.d_utc, test_case.is_lse, d_utc, is_lse); + } } } @@ -567,7 +570,7 @@ mod tests { 0.0, 0.0, &GpsTime::new_unchecked(2080, 0.0), - &GpsTime::new_unchecked(2086, 259218.0 - 0.125), + &GpsTime::new_unchecked(2086, 259_218.0 - 0.125), 18, 19, ) @@ -579,7 +582,7 @@ mod tests { 0.0, 0.0, &GpsTime::new_unchecked(2080, 0.0), - &GpsTime::new_unchecked(2086, 259218.125), + &GpsTime::new_unchecked(2086, 259_218.125), 18, 19, ) @@ -593,7 +596,7 @@ mod tests { &GpsTime::new_unchecked(2080, 0.0), &GpsTime::new_unchecked( 2086, - 259218.0 + 1e-12 * (6.0 * consts::WEEK_SECS as f64 + 259218.0), + 259_218.0 + 1e-12 * (6.0 * f64::from(consts::WEEK_SECS) + 259_218.00), ), 18, 19, @@ -608,13 +611,14 @@ mod tests { &GpsTime::new_unchecked(2080, 0.0), &GpsTime::new_unchecked( 2086, - 259218.0 - 1e-12 * (6.0 * consts::WEEK_SECS as f64 + 259218.0), + 259_218.0 - 1e-12 * (6.0 * f64::from(consts::WEEK_SECS) + 259_218.0), ), 18, 19, ) } + #[expect(clippy::too_many_lines)] #[test] fn utc_params() { struct TestCase { @@ -627,148 +631,148 @@ mod tests { let test_cases = [ /* Jan 1 2020 (constant negative UTC offset) */ TestCase { - t: GpsTime::new_unchecked(2086, 259217.0 - 0.125), + t: GpsTime::new_unchecked(2086, 259_217.0 - 0.125), d_utc: 18.0 - 0.125, is_lse: false, params: Some(make_p_neg_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259217.5 - 0.125), + t: GpsTime::new_unchecked(2086, 259_217.5 - 0.125), d_utc: 18.0 - 0.125, is_lse: false, params: Some(make_p_neg_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.0 - 0.125), + t: GpsTime::new_unchecked(2086, 259_218.0 - 0.125), d_utc: 18.0 - 0.125, is_lse: true, params: Some(make_p_neg_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.5 - 0.125), + t: GpsTime::new_unchecked(2086, 259_218.5 - 0.125), d_utc: 18.0 - 0.125, is_lse: true, params: Some(make_p_neg_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.0 - 0.125), + t: GpsTime::new_unchecked(2086, 259_219.0 - 0.125), d_utc: 19.0 - 0.125, is_lse: false, params: Some(make_p_neg_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.5 - 0.125), + t: GpsTime::new_unchecked(2086, 259_219.5 - 0.125), d_utc: 19.0 - 0.125, is_lse: false, params: Some(make_p_neg_offset()), }, /* Jan 1 2020 (constant positive UTC offset) */ TestCase { - t: GpsTime::new_unchecked(2086, 259217.125), + t: GpsTime::new_unchecked(2086, 259_217.125), d_utc: 18.125, is_lse: false, params: Some(make_p_pos_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259217.5 + 0.125), + t: GpsTime::new_unchecked(2086, 259_217.5 + 0.125), d_utc: 18.125, is_lse: false, params: Some(make_p_pos_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.125), + t: GpsTime::new_unchecked(2086, 259_218.125), d_utc: 18.125, is_lse: true, params: Some(make_p_pos_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.5 + 0.125), + t: GpsTime::new_unchecked(2086, 259_218.5 + 0.125), d_utc: 18.125, is_lse: true, params: Some(make_p_pos_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.125), + t: GpsTime::new_unchecked(2086, 259_219.125), d_utc: 19.125, is_lse: false, params: Some(make_p_pos_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.5 + 0.125), + t: GpsTime::new_unchecked(2086, 259_219.5 + 0.125), d_utc: 19.125, is_lse: false, params: Some(make_p_pos_offset()), }, /* Jan 1 2020 (positive UTC linear correction) */ TestCase { - t: GpsTime::new_unchecked(2086, 259217.0), + t: GpsTime::new_unchecked(2086, 259_217.0), d_utc: 18.0, is_lse: false, params: Some(make_p_pos_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259217.5), + t: GpsTime::new_unchecked(2086, 259_217.5), d_utc: 18.0, is_lse: false, params: Some(make_p_pos_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.0001), + t: GpsTime::new_unchecked(2086, 259_218.000_1), d_utc: 18.0, is_lse: true, params: Some(make_p_pos_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.5), + t: GpsTime::new_unchecked(2086, 259_218.5), d_utc: 18.0, is_lse: true, params: Some(make_p_pos_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.0001), + t: GpsTime::new_unchecked(2086, 259_219.000_1), d_utc: 19.0, is_lse: false, params: Some(make_p_pos_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.5), + t: GpsTime::new_unchecked(2086, 259_219.5), d_utc: 19.0, is_lse: false, params: Some(make_p_pos_trend()), }, /* Jan 1 2020 (negative UTC linear correction) */ TestCase { - t: GpsTime::new_unchecked(2086, 259217.0), + t: GpsTime::new_unchecked(2086, 259_217.0), d_utc: 18.0, is_lse: false, params: Some(make_p_neg_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259217.5), + t: GpsTime::new_unchecked(2086, 259_217.5), d_utc: 18.0, is_lse: false, params: Some(make_p_neg_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.0), + t: GpsTime::new_unchecked(2086, 259_218.0), d_utc: 18.0, is_lse: true, params: Some(make_p_neg_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.5), + t: GpsTime::new_unchecked(2086, 259_218.5), d_utc: 18.0, is_lse: true, params: Some(make_p_neg_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.0), + t: GpsTime::new_unchecked(2086, 259_219.0), d_utc: 19.0, is_lse: false, params: Some(make_p_neg_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.5), + t: GpsTime::new_unchecked(2086, 259_219.5), d_utc: 19.0, is_lse: false, params: Some(make_p_neg_trend()), @@ -798,6 +802,7 @@ mod tests { } } + #[expect(clippy::too_many_lines)] #[test] fn gps2utc() { /* test leap second on 1st Jan 2020 */ @@ -841,27 +846,27 @@ mod tests { let test_cases = [ /* July 1 1981 */ TestCase { - t: GpsTime::new_unchecked(77, 259199.0), + t: GpsTime::new_unchecked(77, 259_199.0), u: UtcExpectation::new(1981, 6, 30, 23, 59, 59.0), p: None, }, TestCase { - t: GpsTime::new_unchecked(77, 259199.5), + t: GpsTime::new_unchecked(77, 259_199.5), u: UtcExpectation::new(1981, 6, 30, 23, 59, 59.5), p: None, }, TestCase { - t: GpsTime::new_unchecked(77, 259200.0), + t: GpsTime::new_unchecked(77, 259_200.0), u: UtcExpectation::new(1981, 6, 30, 23, 59, 60.0), p: None, }, TestCase { - t: GpsTime::new_unchecked(77, 259200.5), + t: GpsTime::new_unchecked(77, 259_200.5), u: UtcExpectation::new(1981, 6, 30, 23, 59, 60.5), p: None, }, TestCase { - t: GpsTime::new_unchecked(77, 259201.0), + t: GpsTime::new_unchecked(77, 259_201.0), u: UtcExpectation::new(1981, 7, 1, 00, 00, 00.0), p: None, }, @@ -920,108 +925,108 @@ mod tests { /* Jan 1 2020 (leap second announced in utc_params_t above, constant negative offset) */ TestCase { - t: GpsTime::new_unchecked(2086, 259217.0 - 0.125), + t: GpsTime::new_unchecked(2086, 259_217.0 - 0.125), u: UtcExpectation::new(2019, 12, 31, 23, 59, 59.0), p: Some(make_p_neg_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259217.5 - 0.125), + t: GpsTime::new_unchecked(2086, 259_217.5 - 0.125), u: UtcExpectation::new(2019, 12, 31, 23, 59, 59.5), p: Some(make_p_neg_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.0 - 0.125), + t: GpsTime::new_unchecked(2086, 259_218.0 - 0.125), u: UtcExpectation::new(2019, 12, 31, 23, 59, 60.0), p: Some(make_p_neg_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.5 - 0.125), + t: GpsTime::new_unchecked(2086, 259_218.5 - 0.125), u: UtcExpectation::new(2019, 12, 31, 23, 59, 60.5), p: Some(make_p_neg_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.0 - 0.125), + t: GpsTime::new_unchecked(2086, 259_219.0 - 0.125), u: UtcExpectation::new(2020, 1, 1, 00, 00, 00.0), p: Some(make_p_neg_offset()), }, /* Jan 1 2020 (leap second announced in utc_params_t above, constant positive offset) */ TestCase { - t: GpsTime::new_unchecked(2086, 259217.125), + t: GpsTime::new_unchecked(2086, 259_217.125), u: UtcExpectation::new(2019, 12, 31, 23, 59, 59.0), p: Some(make_p_pos_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259217.5 + 0.125), + t: GpsTime::new_unchecked(2086, 259_217.5 + 0.125), u: UtcExpectation::new(2019, 12, 31, 23, 59, 59.5), p: Some(make_p_pos_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.125), + t: GpsTime::new_unchecked(2086, 259_218.125), u: UtcExpectation::new(2019, 12, 31, 23, 59, 60.0), p: Some(make_p_pos_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.5 + 0.125), + t: GpsTime::new_unchecked(2086, 259_218.5 + 0.125), u: UtcExpectation::new(2019, 12, 31, 23, 59, 60.5), p: Some(make_p_pos_offset()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.125), + t: GpsTime::new_unchecked(2086, 259_219.125), u: UtcExpectation::new(2020, 1, 1, 00, 00, 00.0), p: Some(make_p_pos_offset()), }, /* Jan 1 2020 (leap second announced in utc_params_t above, positive UTC linear correction) */ TestCase { - t: GpsTime::new_unchecked(2086, 259217.0), + t: GpsTime::new_unchecked(2086, 259_217.0), u: UtcExpectation::new(2019, 12, 31, 23, 59, 59.0), p: Some(make_p_pos_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259217.5), + t: GpsTime::new_unchecked(2086, 259_217.5), u: UtcExpectation::new(2019, 12, 31, 23, 59, 59.5), p: Some(make_p_pos_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.0), + t: GpsTime::new_unchecked(2086, 259_218.0), u: UtcExpectation::new(2019, 12, 31, 23, 59, 60.0), p: Some(make_p_pos_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.5), + t: GpsTime::new_unchecked(2086, 259_218.5), u: UtcExpectation::new(2019, 12, 31, 23, 59, 60.5), p: Some(make_p_pos_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.00001), + t: GpsTime::new_unchecked(2086, 259_219.000_01), u: UtcExpectation::new(2020, 1, 1, 00, 00, 00.0), p: Some(make_p_pos_trend()), }, /* Jan 1 2020 (leap second announced in utc_params_t above, negative UTC linear correction) */ TestCase { - t: GpsTime::new_unchecked(2086, 259217.0), + t: GpsTime::new_unchecked(2086, 259_217.0), u: UtcExpectation::new(2019, 12, 31, 23, 59, 59.0), p: Some(make_p_neg_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259217.5), + t: GpsTime::new_unchecked(2086, 259_217.5), u: UtcExpectation::new(2019, 12, 31, 23, 59, 59.5), p: Some(make_p_neg_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.0), + t: GpsTime::new_unchecked(2086, 259_218.0), u: UtcExpectation::new(2019, 12, 31, 23, 59, 60.0), p: Some(make_p_neg_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259218.5), + t: GpsTime::new_unchecked(2086, 259_218.5), u: UtcExpectation::new(2019, 12, 31, 23, 59, 60.5), p: Some(make_p_neg_trend()), }, TestCase { - t: GpsTime::new_unchecked(2086, 259219.0), + t: GpsTime::new_unchecked(2086, 259_219.0), u: UtcExpectation::new(2020, 1, 1, 00, 00, 00.0), p: Some(make_p_neg_trend()), }, @@ -1099,13 +1104,13 @@ mod tests { Utc, ); - let converted: DateTime = swift_date.clone().into(); + let converted: DateTime = swift_date.into(); assert!((converted - expected_utc).to_std().unwrap() < epsilon); - assert_eq!(converted.year(), swift_date.year() as i32); - assert_eq!(converted.month(), swift_date.month() as u32); - assert_eq!(converted.day(), swift_date.day_of_month() as u32); - assert_eq!(converted.hour(), swift_date.hour() as u32); - assert_eq!(converted.minute(), swift_date.minute() as u32); + assert_eq!(converted.year(), i32::from(swift_date.year())); + assert_eq!(converted.month(), u32::from(swift_date.month())); + assert_eq!(converted.day(), u32::from(swift_date.day_of_month())); + assert_eq!(converted.hour(), u32::from(swift_date.hour())); + assert_eq!(converted.minute(), u32::from(swift_date.minute())); assert_eq!(converted.second(), swift_date.seconds() as u32); } } diff --git a/swiftnav/tests/reference_frames.rs b/swiftnav/tests/reference_frames.rs index 0bcbf3d..ace7d8a 100644 --- a/swiftnav/tests/reference_frames.rs +++ b/swiftnav/tests/reference_frames.rs @@ -889,7 +889,7 @@ fn dref91_r2016() { ReferenceFrame::ITRF2020, ECEF::new(3842152.805, 563402.164, 5042888.600), None, - UtcTime::from_parts(2023, 02, 22, 0, 0, 0.).to_gps_hardcoded(), + UtcTime::from_parts(2023, 2, 22, 0, 0, 0.).to_gps_hardcoded(), ); let transformations = TransformationRepository::from_builtin();