refactor: deprecate into_vec in favour of to_vec

Signed-off-by: Liam Gray <[email protected]>
enarx · Dec 5, 2024 · fe4e2e2 · fe4e2e2
1 parent 2a3025a
commit fe4e2e2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,6 @@ jobs:
           - {name: ciborium-ll}
           - {name: ciborium}
           - {name: ciborium, feat: std}
-          - {name: ciborium, feat: canonical}
           - {name: ciborium-io}
           - {name: ciborium-io, feat: alloc}
           - {name: ciborium-io, feat: std}

diff --git a/ciborium-ll/src/enc.rs b/ciborium-ll/src/enc.rs
@@ -18,23 +18,26 @@ impl<W: Write> From<W> for Encoder<W> {
 impl<W: Write> Write for Encoder<W> {
     type Error = W::Error;
 
+    #[inline]
     fn write_all(&mut self, data: &[u8]) -> Result<(), Self::Error> {
         self.0.write_all(data)
     }
 
+    #[inline]
     fn flush(&mut self) -> Result<(), Self::Error> {
         self.0.flush()
     }
 }
 
 impl<W: Write> Encoder<W> {
     /// Unwraps the `Write`, consuming the `Encoder`.
+    #[inline]
     pub fn into_inner(self) -> W {
         self.0
     }
 
     /// Push a `Header` to the wire
-    #[inline]
+    #[inline(always)]
     pub fn push(&mut self, header: Header) -> Result<(), W::Error> {
         let title = Title::from(header);
 

diff --git a/ciborium-ll/src/hdr.rs b/ciborium-ll/src/hdr.rs
@@ -75,6 +75,7 @@ pub enum Header {
 impl TryFrom<Title> for Header {
     type Error = InvalidError;
 
+    #[inline]
     fn try_from(title: Title) -> Result<Self, Self::Error> {
         let opt = |minor| {
             Some(match minor {
@@ -116,6 +117,7 @@ impl TryFrom<Title> for Header {
 }
 
 impl From<Header> for Title {
+    #[inline(always)]
     fn from(header: Header) -> Self {
         let int = |i: u64| match i {
             x if x <= 23 => Minor::This(i as u8),

diff --git a/ciborium/src/ser/error.rs b/ciborium/src/ser/error.rs
@@ -10,7 +10,7 @@ use serde::ser::{Error as SerError, StdError};
 pub enum Error<T> {
     /// An error occurred while writing bytes
     ///
-    /// Contains the underlying error reaturned while writing.
+    /// Contains the underlying error returned while writing.
     Io(T),
 
     /// An error indicating a value that cannot be serialized

diff --git a/ciborium/src/ser/mod.rs b/ciborium/src/ser/mod.rs
@@ -508,7 +508,7 @@ where
             serializer,
             collection_type,
             length,
-            tag_written: false,
+            tag_written: !matches!(collection_type, CollectionType::Tag),
             #[cfg(feature = "std")]
             cache_keys: Vec::new(),
             #[cfg(feature = "std")]
@@ -645,7 +645,7 @@ where
         &mut self,
         value: &U,
     ) -> Result<(), Self::Error> {
-        if self.tag_written || !matches!(self.collection_type, CollectionType::Tag) {
+        if self.tag_written {
             // untagged tuples are CollectionType::Array to skip writing the tag header
             return self.inline_serialize_value(value);
         }