Update to heapless 0.9

Author: sosthene-nitrokey

Cargo.toml

@@ -9,7 +9,7 @@ license = "Apache-2.0 OR MIT"
 repository = "https://github.com/solokeys/ctaphid-dispatch"
 
 [workspace.dependencies]
-heapless-bytes = "0.3"
+heapless-bytes = "0.5"
 trussed-core = "0.1.0"
 
 [patch.crates-io]

app/src/lib.rs

@@ -1,6 +1,6 @@
 #![no_std]
 
-use heapless_bytes::Bytes;
+use heapless_bytes::BytesView;
 use trussed_core::InterruptFlag;
 
 mod command;
@@ -10,7 +10,7 @@ pub use command::{Command, VendorCommand};
 /// trait interface for a CTAPHID application.
 /// The application chooses which commands to register to, and will be called upon
 /// when the commands are received in the CTAPHID layer.  Only one application can be registered to a particular command.
-pub trait App<'interrupt, const N: usize> {
+pub trait App<'interrupt> {
     /// Get access to the app interrupter
     fn interrupt(&self) -> Option<&'interrupt InterruptFlag> {
         None
@@ -27,7 +27,7 @@ pub trait App<'interrupt, const N: usize> {
         &mut self,
         command: Command,
         request: &[u8],
-        response: &mut Bytes<N>,
+        response: &mut BytesView,
     ) -> Result<(), Error>;
 }
 

dispatch/Cargo.toml

@@ -21,6 +21,7 @@ default = []
 std = ["delog/std"]
 
 log-all = []
+log-trace = []
 log-none = []
 log-info = []
 log-debug = []

dispatch/src/dispatch.rs

@@ -1,6 +1,6 @@
 use core::sync::atomic::Ordering;
 
-use crate::types::{InterchangeResponse, Message, Responder, MESSAGE_SIZE};
+use crate::types::{InterchangeResponse, Message, Responder};
 
 use ctaphid_app::{App, Command, Error};
 use ref_swap::OptionRefSwap;
@@ -33,8 +33,8 @@ impl<'pipe, 'interrupt> Dispatch<'pipe, 'interrupt> {
 
     fn find_app<'a, 'b>(
         command: Command,
-        apps: &'a mut [&'b mut dyn App<'interrupt, MESSAGE_SIZE>],
-    ) -> Option<&'a mut &'b mut dyn App<'interrupt, MESSAGE_SIZE>> {
+        apps: &'a mut [&'b mut dyn App<'interrupt>],
+    ) -> Option<&'a mut &'b mut dyn App<'interrupt>> {
         apps.iter_mut()
             .find(|app| app.commands().contains(&command))
     }
@@ -73,12 +73,7 @@ impl<'pipe, 'interrupt> Dispatch<'pipe, 'interrupt> {
     }
 
     #[inline(never)]
-    fn call_app(
-        &mut self,
-        app: &mut dyn App<'interrupt, MESSAGE_SIZE>,
-        command: Command,
-        request: &Message,
-    ) {
+    fn call_app(&mut self, app: &mut dyn App<'interrupt>, command: Command, request: &Message) {
         let response_buffer = self
             .responder
             .response_mut()
@@ -109,7 +104,7 @@ impl<'pipe, 'interrupt> Dispatch<'pipe, 'interrupt> {
     }
 
     #[inline(never)]
-    pub fn poll(&mut self, apps: &mut [&mut dyn App<'interrupt, MESSAGE_SIZE>]) -> bool {
+    pub fn poll(&mut self, apps: &mut [&mut dyn App<'interrupt>]) -> bool {
         // We could call take_request directly, but for some reason this doubles stack usage.
         let mut message_buffer = Message::new();
         if let Ok((command, message)) = self.responder.request() {