bump core dependencies

satrs-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "satrs-core"
-version = "0.1.0-alpha.3"
+version = "0.1.0-alpha.2"
 edition = "2021"
 rust-version = "1.61"
 authors = ["Robin Mueller <muellerr@irs.uni-stuttgart.de>"]

satrs-core/src/pool.rs

@@ -1,12 +1,5 @@
 //! # Pool implementation providing memory pools for packet storage.
 //!
-//! This module provides generic abstractions for memory pools which provide a storage
-//! machanism for variable sized data like Telemetry and Telecommand (TMTC) packets. The core
-//! abstraction for this is the [PoolProvider] trait.
-//!
-//! It also contains the [StaticMemoryPool] as a concrete implementation which can be used to avoid
-//! dynamic run-time allocations for the storage of TMTC packets.
-//!
 //! # Example for the [StaticMemoryPool]
 //!
 //! ```
@@ -380,8 +373,8 @@ mod alloc_mod {
     ///     the number of memory blocks in the subpool, the second entry the size of the blocks
     /// * `spill_to_higher_subpools` - Specifies whether data will be spilled to higher subpools
     ///     if the next fitting subpool is full. This is useful to ensure the pool remains useful
-    ///     for all data sizes as long as possible. However, an undesirable side-effect might be
+    ///     for all data sizes as long as possible, but it might also lead to frequently used
-    ///     the chocking of larger subpools by underdimensioned smaller subpools.
+    ///     subpools which were not dimensioned properly chocking larger subpools.
     #[derive(Clone)]
     pub struct StaticPoolConfig {
         cfg: Vec<(NumBlocks, usize)>,

satrs-core/src/pus/scheduler.rs

@@ -238,8 +238,7 @@ impl Error for ScheduleError {
     }
 }
 
-/// Generic trait for scheduler objects which are able to schedule ECSS PUS C packets.
+pub trait PusSchedulerInterface {
-pub trait PusSchedulerProvider {
     type TimeProvider: CcsdsTimeProvider + TimeReader;
 
     fn reset(&mut self, store: &mut (impl PoolProvider + ?Sized)) -> Result<(), StoreError>;
@@ -783,7 +782,7 @@ pub mod alloc_mod {
         }
     }
 
-    impl PusSchedulerProvider for PusScheduler {
+    impl PusSchedulerInterface for PusScheduler {
         type TimeProvider = cds::TimeProvider;
 
         /// This will disable the scheduler and clear the schedule as specified in 6.11.4.4.

satrs-core/src/pus/scheduler_srv.rs

@@ -1,4 +1,4 @@
-use super::scheduler::PusSchedulerProvider;
+use super::scheduler::PusSchedulerInterface;
 use super::{EcssTcInMemConverter, PusServiceBase, PusServiceHelper};
 use crate::pool::PoolProvider;
 use crate::pus::{PusPacketHandlerResult, PusPacketHandlingError};
@@ -16,13 +16,13 @@ use spacepackets::time::cds::TimeProvider;
 /// telecommands when applicable.
 pub struct PusService11SchedHandler<
     TcInMemConverter: EcssTcInMemConverter,
-    PusScheduler: PusSchedulerProvider,
+    Scheduler: PusSchedulerInterface,
 > {
     pub service_helper: PusServiceHelper<TcInMemConverter>,
-    scheduler: PusScheduler,
+    scheduler: Scheduler,
 }
 
-impl<TcInMemConverter: EcssTcInMemConverter, Scheduler: PusSchedulerProvider>
+impl<TcInMemConverter: EcssTcInMemConverter, Scheduler: PusSchedulerInterface>
     PusService11SchedHandler<TcInMemConverter, Scheduler>
 {
     pub fn new(service_helper: PusServiceHelper<TcInMemConverter>, scheduler: Scheduler) -> Self {
@@ -173,7 +173,7 @@ mod tests {
     use crate::pool::{StaticMemoryPool, StaticPoolConfig};
     use crate::pus::tests::TEST_APID;
     use crate::pus::{
-        scheduler::{self, PusSchedulerProvider, TcInfo},
+        scheduler::{self, PusSchedulerInterface, TcInfo},
         tests::{PusServiceHandlerWithSharedStoreCommon, PusTestHarness},
         verification::{RequestId, TcStateAccepted, VerificationToken},
         EcssTcInSharedStoreConverter,
@@ -232,7 +232,7 @@ mod tests {
         inserted_tcs: VecDeque<TcInfo>,
     }
 
-    impl PusSchedulerProvider for TestScheduler {
+    impl PusSchedulerInterface for TestScheduler {
         type TimeProvider = cds::TimeProvider;
 
         fn reset(

satrs-mib/Cargo.toml

@@ -23,8 +23,8 @@ version = "1"
 optional = true
 
 [dependencies.satrs-core]
-path = "../satrs-core"
+# path = "../satrs-core"
-# version = "0.1.0-alpha.1"
+version = "0.1.0-alpha.2"
 # git = "https://egit.irs.uni-stuttgart.de/rust/sat-rs.git"
 # branch = "main"
 # rev = "35e1f7a983f6535c5571186e361fe101d4306b89"

satrs-mib/codegen/Cargo.toml

@@ -20,8 +20,8 @@ quote = "1"
 proc-macro2 = "1"
 
 [dependencies.satrs-core]
-path = "../../satrs-core"
+# path = "../../satrs-core"
-# version = "0.1.0-alpha.1"
+version = "0.1.0-alpha.2"
 # git = "https://egit.irs.uni-stuttgart.de/rust/sat-rs.git"
 # branch = "main"
 # rev = "35e1f7a983f6535c5571186e361fe101d4306b89"