From 6bbfdea944489dc2ffead33b1af9b5135b1dc1d2 Mon Sep 17 00:00:00 2001
From: Liam Gray <hoxxep@gmail.com>
Date: Thu, 5 Dec 2024 00:31:02 +0000
Subject: [PATCH] fix: merge master in a way that keeps DCO happy

Signed-off-by: Liam Gray <hoxxep@gmail.com>
---
 ciborium/src/lib.rs     |  4 ----
 ciborium/src/ser/mod.rs | 12 ------------
 2 files changed, 16 deletions(-)

diff --git a/ciborium/src/lib.rs b/ciborium/src/lib.rs
index 4d9f684..432675a 100644
--- 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
index d772df3..4bf393b 100644
--- 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)
-}