fix: merge master in a way that keeps DCO happy

Signed-off-by: Liam Gray <[email protected]>
enarx · Dec 5, 2024 · 6bbfdea · 6bbfdea
1 parent 15b250e
commit 6bbfdea
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/ciborium/src/lib.rs b/ciborium/src/lib.rs
@@ -133,10 +133,6 @@ pub use crate::ser::{into_writer_canonical, to_vec, to_vec_canonical};
 #[deprecated(since = "0.3.0", note = "Please use `to_vec` instead")]
 pub use crate::ser::to_vec as into_vec;
 
-#[cfg(feature = "std")]
-#[doc(inline)]
-pub use crate::ser::into_vec;
-
 #[doc(inline)]
 pub use crate::value::Value;
 

diff --git a/ciborium/src/ser/mod.rs b/ciborium/src/ser/mod.rs
@@ -868,15 +868,3 @@ where
     let mut encoder: Serializer<W, C> = Serializer::new(writer);
     value.serialize(&mut encoder)
 }
-
-#[cfg(feature = "std")]
-/// Serializes as CBOR into a new Vec<u8>
-#[inline]
-pub fn into_vec<T: ?Sized + ser::Serialize>(
-    value: &T,
-) -> Result<Vec<u8>, Error<<Vec<u8> as ciborium_io::Write>::Error>> {
-    let mut vector = vec![];
-    let mut encoder = Serializer::from(&mut vector);
-    value.serialize(&mut encoder)?;
-    Ok(vector)
-}