From 1bf8138a9455dd1b0552374195962f6335cc2df6 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 16 Aug 2022 11:15:23 +0200
Subject: [PATCH] bump spacepackets, clippy fixes

---
 .idea/runConfigurations/Check.xml   |  7 ++++---
 .idea/runConfigurations/Clippy.xml  |  2 +-
 .idea/runConfigurations/Test.xml    |  3 ++-
 Cargo.lock                          | 20 +-------------------
 fsrc-core/src/events.rs             |  4 ++--
 fsrc-core/src/executable.rs         |  2 +-
 fsrc-core/src/pool.rs               |  6 +++---
 fsrc-core/src/tmtc/ccsds_distrib.rs |  2 +-
 fsrc-core/src/tmtc/pus_distrib.rs   |  8 ++++----
 spacepackets                        |  2 +-
 10 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/.idea/runConfigurations/Check.xml b/.idea/runConfigurations/Check.xml
index 7742dee..44c4c7f 100644
--- a/.idea/runConfigurations/Check.xml
+++ b/.idea/runConfigurations/Check.xml
@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Check" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run" />
+    <option name="command" value="check" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
-    <option name="requiredFeatures" value="true" />
-    <option name="allFeatures" value="true" />
+    <option name="requiredFeatures" value="false" />
+    <option name="allFeatures" value="false" />
     <option name="emulateTerminal" value="false" />
     <option name="withSudo" value="false" />
+    <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
     <envs />
     <option name="isRedirectInput" value="false" />
diff --git a/.idea/runConfigurations/Clippy.xml b/.idea/runConfigurations/Clippy.xml
index 816669e..8634d06 100644
--- a/.idea/runConfigurations/Clippy.xml
+++ b/.idea/runConfigurations/Clippy.xml
@@ -4,7 +4,7 @@
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
-    <option name="allFeatures" value="false" />
+    <option name="allFeatures" value="true" />
     <option name="emulateTerminal" value="false" />
     <option name="withSudo" value="false" />
     <option name="buildTarget" value="REMOTE" />
diff --git a/.idea/runConfigurations/Test.xml b/.idea/runConfigurations/Test.xml
index 15edb2f..81a2166 100644
--- a/.idea/runConfigurations/Test.xml
+++ b/.idea/runConfigurations/Test.xml
@@ -4,9 +4,10 @@
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
-    <option name="allFeatures" value="false" />
+    <option name="allFeatures" value="true" />
     <option name="emulateTerminal" value="false" />
     <option name="withSudo" value="false" />
+    <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
     <envs />
     <option name="isRedirectInput" value="false" />
diff --git a/Cargo.lock b/Cargo.lock
index e63d3e4..044c4eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -110,7 +110,6 @@ dependencies = [
  "js-sys",
  "num-integer",
  "num-traits",
- "time",
  "wasm-bindgen",
  "winapi",
 ]
@@ -587,7 +586,7 @@ dependencies = [
  "chrono",
  "crc",
  "delegate",
- "num",
+ "num-traits",
  "postcard",
  "serde",
  "zerocopy",
@@ -651,17 +650,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi",
- "winapi",
-]
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.1"
@@ -695,12 +683,6 @@ dependencies = [
  "vcell",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.82"
diff --git a/fsrc-core/src/events.rs b/fsrc-core/src/events.rs
index 83d39a7..dec000c 100644
--- a/fsrc-core/src/events.rs
+++ b/fsrc-core/src/events.rs
@@ -5,7 +5,7 @@ pub type GroupId = u16;
 pub type UniqueId = u16;
 pub type EventRaw = u32;
 
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Severity {
     INFO = 1,
     LOW = 2,
@@ -27,7 +27,7 @@ impl TryFrom<u8> for Severity {
     }
 }
 
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct Event {
     severity: Severity,
     group_id: GroupId,
diff --git a/fsrc-core/src/executable.rs b/fsrc-core/src/executable.rs
index e44cd84..4ca4db0 100644
--- a/fsrc-core/src/executable.rs
+++ b/fsrc-core/src/executable.rs
@@ -6,7 +6,7 @@ use std::thread;
 use std::thread::JoinHandle;
 use std::time::Duration;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum OpResult {
     Ok,
     TerminationRequested,
diff --git a/fsrc-core/src/pool.rs b/fsrc-core/src/pool.rs
index 63f1d4b..0efa7d8 100644
--- a/fsrc-core/src/pool.rs
+++ b/fsrc-core/src/pool.rs
@@ -110,7 +110,7 @@ pub struct LocalPool {
 }
 
 /// Simple address type used for transactions with the local pool.
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct StoreAddr {
     pool_idx: u16,
     packet_idx: NumBlocks,
@@ -124,13 +124,13 @@ impl StoreAddr {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum StoreIdError {
     InvalidSubpool(u16),
     InvalidPacketIdx(u16),
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum StoreError {
     /// Requested data block is too large
     DataTooLarge(usize),
diff --git a/fsrc-core/src/tmtc/ccsds_distrib.rs b/fsrc-core/src/tmtc/ccsds_distrib.rs
index f4b526b..689b956 100644
--- a/fsrc-core/src/tmtc/ccsds_distrib.rs
+++ b/fsrc-core/src/tmtc/ccsds_distrib.rs
@@ -121,7 +121,7 @@ pub struct CcsdsDistributor<E> {
     pub apid_handler: Box<dyn ApidPacketHandler<Error = E>>,
 }
 
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum CcsdsError<E> {
     CustomError(E),
     PacketError(PacketError),
diff --git a/fsrc-core/src/tmtc/pus_distrib.rs b/fsrc-core/src/tmtc/pus_distrib.rs
index 7ace4e3..2928110 100644
--- a/fsrc-core/src/tmtc/pus_distrib.rs
+++ b/fsrc-core/src/tmtc/pus_distrib.rs
@@ -87,13 +87,13 @@ impl<E> PusDistributor<E> {
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum PusDistribError<E> {
     CustomError(E),
     PusError(PusError),
 }
 
-impl<E> ReceivesTc for PusDistributor<E> {
+impl<E: 'static> ReceivesTc for PusDistributor<E> {
     type Error = PusDistribError<E>;
     fn pass_tc(&mut self, tm_raw: &[u8]) -> Result<(), Self::Error> {
         // Convert to ccsds and call pass_ccsds
@@ -103,7 +103,7 @@ impl<E> ReceivesTc for PusDistributor<E> {
     }
 }
 
-impl<E> ReceivesCcsdsTc for PusDistributor<E> {
+impl<E: 'static> ReceivesCcsdsTc for PusDistributor<E> {
     type Error = PusDistribError<E>;
     fn pass_ccsds(&mut self, header: &SpHeader, tm_raw: &[u8]) -> Result<(), Self::Error> {
         let (tc, _) =
@@ -112,7 +112,7 @@ impl<E> ReceivesCcsdsTc for PusDistributor<E> {
     }
 }
 
-impl<E> ReceivesEcssPusTc for PusDistributor<E> {
+impl<E: 'static> ReceivesEcssPusTc for PusDistributor<E> {
     type Error = PusDistribError<E>;
     fn pass_pus_tc(&mut self, header: &SpHeader, pus_tc: &PusTc) -> Result<(), Self::Error> {
         self.service_provider
diff --git a/spacepackets b/spacepackets
index 1969f1b..35073a4 160000
--- a/spacepackets
+++ b/spacepackets
@@ -1 +1 @@
-Subproject commit 1969f1bfa0ebb8327d155e5e44d5a1a2d88b955c
+Subproject commit 35073a45a536051e3852696c501d7afa1b36a808