Merge pull request #6 from DLR-FT/dev/no-const-expr

Remove const expression

.github/workflows/nix.yml

@@ -27,6 +27,8 @@ jobs:
         command:
           - verify-no_std
           - verify-doc
+          - verify-features
+          - verify-tests
     steps:
       - uses: actions/checkout@v2
       - name: Install Nix

Cargo.toml

@@ -7,9 +7,25 @@ license = "MIT OR Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+default = []
+alloc = ["postcard/alloc"]
+
 [dependencies]
-serde = { version = "1.0", features = ["derive"], default-features = false }
+serde.workspace = true
 postcard = { version = "1.0", default-features = false }
-arrayvec = { version = "0.7", default-features = false }
+a653rs.workspace = true
+
+[dev-dependencies]
+a653rs = { workspace = true, features = ["bindings"] }
+serde = { workspace = true, features = ["alloc"] }
+
+[package.metadata.cargo-all-features]
+skip_optional_dependencies = true
+
+[package.metadata."docs.rs"]
+all-features = true
 
-a653rs = "0.5"
+[workspace.dependencies]
+a653rs = "0.6"
+serde = { version = "1.0", default-features = false}

flake.nix

@@ -1,5 +1,6 @@
 {
   inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     utils.url = "github:numtide/flake-utils";
     devshell.url = "github:numtide/devshell";
     fenix.url = "github:nix-community/fenix";
@@ -16,11 +17,11 @@
           };
           rust-toolchain = with fenix.packages.${system};
             combine [
-              latest.rustc
-              latest.cargo
-              latest.clippy
+              stable.rustc
+              stable.cargo
+              stable.clippy
               latest.rustfmt
-              targets.thumbv6m-none-eabi.latest.rust-std
+              targets.thumbv6m-none-eabi.stable.rust-std
             ];
         in
         rec {
@@ -34,6 +35,7 @@
               cargo-outdated
               cargo-audit
               cargo-udeps
+              cargo-all-features
               cargo-watch
               nixpkgs-fmt
             ];
@@ -82,6 +84,26 @@
                   "Verify that the documentation builds without problems";
                 category = "test";
               }
+              {
+                name = "verify-features";
+                command = ''
+                  cd $PRJ_ROOT
+                  cargo check-all-features $@
+                '';
+                help =
+                  "Verify that all feature combinations build";
+                category = "test";
+              }
+              {
+                name = "verify-tests";
+                command = ''
+                  cd $PRJ_ROOT
+                  cargo test-all-features $@
+                '';
+                help =
+                  "Verify that all tests run for all feature combinations";
+                category = "test";
+              }
             ];
           });
           checks = {

src/error.rs

@@ -1,46 +1,77 @@
+//! Error Types
+
+#[cfg(feature = "alloc")]
+use alloc::vec::Vec;
+
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
 use a653rs::prelude::*;
-use arrayvec::ArrayVec;
 
+#[cfg(feature = "alloc")]
 #[derive(Debug, Clone)]
-pub enum QueuingRecvError<const MSG_SIZE: MessageSize>
-where
-    [u8; MSG_SIZE as usize]:,
-{
+pub enum QueuingRecvError {
     Apex(a653rs::prelude::Error),
-    Postcard(postcard::Error, ArrayVec<u8, { MSG_SIZE as usize }>),
+    /// Postcard deserialization error
+    ///
+    /// Also returns the data which failed to deserialize
+    Postcard(postcard::Error, Vec<u8>),
 }
 
-impl<const MSG_SIZE: MessageSize> From<a653rs::prelude::Error> for QueuingRecvError<MSG_SIZE>
-where
-    [u8; MSG_SIZE as usize]:,
-{
+#[cfg(feature = "alloc")]
+impl From<a653rs::prelude::Error> for QueuingRecvError {
     fn from(e: a653rs::prelude::Error) -> Self {
         QueuingRecvError::Apex(e)
     }
 }
 
 #[derive(Debug, Clone)]
-pub enum SamplingRecvError<const MSG_SIZE: MessageSize>
-where
-    [u8; MSG_SIZE as usize]:,
-{
+pub enum QueuingRecvBufError<'a> {
     Apex(a653rs::prelude::Error),
-    Postcard(
-        postcard::Error,
-        Validity,
-        ArrayVec<u8, { MSG_SIZE as usize }>,
-    ),
+    /// Postcard deserialization error
+    ///
+    /// Also returns the data which failed to deserialize
+    Postcard(postcard::Error, &'a [u8]),
 }
 
-impl<const MSG_SIZE: MessageSize> From<a653rs::prelude::Error> for SamplingRecvError<MSG_SIZE>
-where
-    [u8; MSG_SIZE as usize]:,
-{
+impl From<a653rs::prelude::Error> for QueuingRecvBufError<'_> {
+    fn from(e: a653rs::prelude::Error) -> Self {
+        QueuingRecvBufError::Apex(e)
+    }
+}
+
+#[cfg(feature = "alloc")]
+#[derive(Debug, Clone)]
+pub enum SamplingRecvError {
+    Apex(a653rs::prelude::Error),
+    /// Postcard deserialization error
+    ///
+    /// Also returns the data which failed to deserialize and its [`Validity`]
+    Postcard(postcard::Error, Validity, Vec<u8>),
+}
+
+#[cfg(feature = "alloc")]
+impl From<a653rs::prelude::Error> for SamplingRecvError {
     fn from(e: a653rs::prelude::Error) -> Self {
         SamplingRecvError::Apex(e)
     }
 }
 
+#[derive(Debug, Clone)]
+pub enum SamplingRecvBufError<'a> {
+    Apex(a653rs::prelude::Error),
+    /// Postcard deserialization error
+    ///
+    /// Also returns the data which failed to deserialize and its [`Validity`]
+    Postcard(postcard::Error, Validity, &'a [u8]),
+}
+
+impl From<a653rs::prelude::Error> for SamplingRecvBufError<'_> {
+    fn from(e: a653rs::prelude::Error) -> Self {
+        SamplingRecvBufError::Apex(e)
+    }
+}
+
 #[derive(Debug)]
 pub enum SendError {
     Apex(a653rs::prelude::Error),

src/lib.rs

@@ -1,7 +1,4 @@
 #![no_std]
-// #![deny(missing_docs)]
-#![allow(incomplete_features)]
-#![feature(generic_const_exprs)]
 #![deny(rustdoc::broken_intra_doc_links)]
 
 pub mod error;

src/prelude.rs

@@ -1,3 +1,5 @@
+//! Convenience prelude for simple import
+
 pub use crate::error::*;
 pub use crate::queuing::*;
 pub use crate::sampling::*;