From 89375e86dba7b74d1dd46fb5ce036719fec3670a Mon Sep 17 00:00:00 2001 From: Hidekazu Kobayashi Date: Fri, 19 Apr 2024 12:57:10 +0000 Subject: [PATCH] Resolve warnings --- gaia-ccsds-c2a/src/ccsds/aos/m_pdu.rs | 4 ++-- gaia-ccsds-c2a/src/ccsds_c2a/aos/virual_channel.rs | 2 +- gaia-tmtc/src/recorder.rs | 4 ++-- tmtc-c2a/src/kble_gs.rs | 2 +- tmtc-c2a/src/registry/cmd.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gaia-ccsds-c2a/src/ccsds/aos/m_pdu.rs b/gaia-ccsds-c2a/src/ccsds/aos/m_pdu.rs index 96b71073..fde00e07 100644 --- a/gaia-ccsds-c2a/src/ccsds/aos/m_pdu.rs +++ b/gaia-ccsds-c2a/src/ccsds/aos/m_pdu.rs @@ -153,11 +153,11 @@ mod tests { bytes }; defrag.push(&m_pdu1).unwrap(); - let packet = defrag.read().unwrap(); + let packet = defrag.read_as_bytes_and_packet().unwrap().1; assert_eq!(1, packet.packet_data.len()); assert_eq!(0xDE, packet.packet_data[0]); let size = packet.packet_size().unwrap(); assert_eq!(defrag.advance(), size); - assert!(defrag.read().is_none()); + assert!(defrag.read_as_bytes_and_packet().is_none()); } } diff --git a/gaia-ccsds-c2a/src/ccsds_c2a/aos/virual_channel.rs b/gaia-ccsds-c2a/src/ccsds_c2a/aos/virual_channel.rs index e70588bb..2291d010 100644 --- a/gaia-ccsds-c2a/src/ccsds_c2a/aos/virual_channel.rs +++ b/gaia-ccsds-c2a/src/ccsds_c2a/aos/virual_channel.rs @@ -15,6 +15,6 @@ pub struct Demuxer { impl Demuxer { pub fn demux(&mut self, vcid: u8) -> &mut VirtualChannel { - self.channels.entry(vcid).or_insert_with(Default::default) + self.channels.entry(vcid).or_default() } } diff --git a/gaia-tmtc/src/recorder.rs b/gaia-tmtc/src/recorder.rs index c1b0a9af..936aeb90 100644 --- a/gaia-tmtc/src/recorder.rs +++ b/gaia-tmtc/src/recorder.rs @@ -32,8 +32,8 @@ impl Hook> for RecordHook { async fn hook(&mut self, tco: Arc) -> Result { let now = chrono::Utc::now().naive_utc(); let timestamp = Timestamp { - seconds: now.timestamp(), - nanos: now.timestamp_subsec_nanos() as i32, + seconds: now.and_utc().timestamp(), + nanos: now.and_utc().timestamp_subsec_nanos() as i32, }; self.recorder_client .post_command(PostCommandRequest { diff --git a/tmtc-c2a/src/kble_gs.rs b/tmtc-c2a/src/kble_gs.rs index 4928b7b0..376a3065 100644 --- a/tmtc-c2a/src/kble_gs.rs +++ b/tmtc-c2a/src/kble_gs.rs @@ -1,5 +1,5 @@ use anyhow::{anyhow, ensure, Result}; -use futures::{future, SinkExt, TryStreamExt}; +use futures::{SinkExt, TryStreamExt}; use gaia_ccsds_c2a::{ ccsds::{ aos, diff --git a/tmtc-c2a/src/registry/cmd.rs b/tmtc-c2a/src/registry/cmd.rs index 9627b0bc..a2bc1941 100644 --- a/tmtc-c2a/src/registry/cmd.rs +++ b/tmtc-c2a/src/registry/cmd.rs @@ -134,7 +134,7 @@ impl Registry { data_type: data_type.into(), } }) - .chain(trailer_parameter.into_iter()) + .chain(trailer_parameter) .collect(); let command_name = command_name.to_string(); let command_schema = proto::CommandSchema {