Use bytes::Bytes for binary

changelog/@unreleased/pr-345.v2.yml

@@ -0,0 +1,5 @@
+type: break
+break:
+  description: The Conjure `binary` type is now backed by `bytes::Bytes`.
+  links:
+  - https://github.com/palantir/conjure-rust/pull/345

conjure-codegen/src/context.rs

@@ -331,7 +331,7 @@ impl Context {
                     }
                 }
                 PrimitiveType::Safelong => quote!(conjure_object::SafeLong),
-                PrimitiveType::Binary => quote!(conjure_object::ByteBuf),
+                PrimitiveType::Binary => quote!(conjure_object::Bytes),
                 PrimitiveType::Any => quote!(conjure_object::Any),
                 PrimitiveType::Boolean => quote!(bool),
                 PrimitiveType::Uuid => quote!(conjure_object::Uuid),
@@ -414,7 +414,7 @@ impl Context {
                 PrimitiveType::Integer => quote!(i32),
                 PrimitiveType::Double => quote!(f64),
                 PrimitiveType::Safelong => quote!(conjure_object::SafeLong),
-                PrimitiveType::Binary => quote!(&[u8]),
+                PrimitiveType::Binary => quote!(&conjure_object::Bytes),
                 PrimitiveType::Any => quote!(&conjure_object::Any),
                 PrimitiveType::Boolean => quote!(bool),
                 PrimitiveType::Uuid => quote!(conjure_object::Uuid),
@@ -466,8 +466,10 @@ impl Context {
         match def {
             Type::Primitive(def) => match *def {
                 PrimitiveType::String => quote!(&*#value),
-                PrimitiveType::Binary => quote!(&**#value),
-                PrimitiveType::Any | PrimitiveType::Rid | PrimitiveType::Bearertoken => {
+                PrimitiveType::Any
+                | PrimitiveType::Rid
+                | PrimitiveType::Bearertoken
+                | PrimitiveType::Binary => {
                     quote!(&#value)
                 }
                 PrimitiveType::Datetime
@@ -524,10 +526,9 @@ impl Context {
                 }
                 PrimitiveType::Binary => {
                     let into = self.into_ident(this_type);
-                    let vec = self.vec_ident(this_type);
                     SetterBounds::Generic {
-                        argument_bound: quote!(#into<#vec<u8>>),
-                        assign_rhs: quote!(conjure_object::ByteBuf::from(#value_ident)),
+                        argument_bound: quote!(#into<conjure_object::Bytes>),
+                        assign_rhs: quote!(#value_ident.into()),
                     }
                 }
                 PrimitiveType::Any => SetterBounds::Generic {
@@ -645,10 +646,9 @@ impl Context {
                 }
                 PrimitiveType::Binary => {
                     let into = self.into_ident(this_type);
-                    let vec = self.vec_ident(this_type);
                     CollectionSetterBounds::Generic {
-                        argument_bound: quote!(#into<#vec<u8>>),
-                        assign_rhs: quote!(conjure_object::ByteBuf::from(#value_ident)),
+                        argument_bound: quote!(#into<conjure_object::Bytes>),
+                        assign_rhs: quote!(#value_ident.into()),
                     }
                 }
                 PrimitiveType::Any => CollectionSetterBounds::Generic {

conjure-codegen/src/lib.rs

@@ -57,7 +57,7 @@
 //! | `integer`     | `i32`                                |
 //! | `double`      | `f64`                                |
 //! | `safelong`    | `conjure_object::SafeLong`           |
-//! | `binary`      | `serde_bytes::ByteBuf`               |
+//! | `binary`      | `bytes::Bytes`                       |
 //! | `any`         | `conjure_object::Any`                |
 //! | `boolean`     | `bool`                               |
 //! | `uuid`        | `uuid::Uuid`                         |

conjure-object/Cargo.toml

@@ -9,6 +9,7 @@ repository = "https://github.com/palantir/conjure-rust"
 readme = "../README.md"
 
 [dependencies]
+bytes = { version = "1.0", features = ["serde"] }
 base64 = "0.22"
 chrono = { version = "0.4.26", default-features = false, features = ["clock", "std", "serde"] }
 educe = { version = "0.5", default-features = false, features = [
@@ -22,7 +23,6 @@ lazy_static = "1.0"
 ordered-float = { version = "4", features = ["serde"] }
 regex = { version = "1.3", default-features = false, features = ["std"] }
 serde = "1.0"
-serde_bytes = "0.11"
 uuid = { version = "1.1", features = ["serde"] }
 
 [dev-dependencies]

conjure-object/src/lib.rs

@@ -18,9 +18,9 @@
 //! This crate consists of reexports and definitions of the Rust types that correspond to Conjure types. It is a
 //! required dependency of crates which contain Conjure-generated code.
 
+pub use bytes::{self, Bytes};
 pub use chrono::{self, DateTime, Utc};
 pub use serde;
-pub use serde_bytes::{self, ByteBuf};
 pub use uuid::{self, Uuid};
 
 #[doc(inline)]

conjure-object/src/plain.rs

@@ -17,9 +17,9 @@
 use base64::display::Base64Display;
 use base64::engine::general_purpose::STANDARD;
 use base64::{DecodeError, Engine};
+use bytes::Bytes;
 use chrono::format::{Fixed, Item, ParseError};
 use chrono::{DateTime, Utc};
-use serde_bytes::ByteBuf;
 use std::error::Error;
 use std::f64;
 use std::fmt;
@@ -97,13 +97,7 @@ impl Plain for [u8] {
     }
 }
 
-impl Plain for Vec<u8> {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        Plain::fmt(&**self, fmt)
-    }
-}
-
-impl Plain for ByteBuf {
+impl Plain for Bytes {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         Plain::fmt(&**self, fmt)
     }
@@ -167,13 +161,13 @@ as_from_str!(SafeLong);
 as_from_str!(String);
 as_from_str!(Uuid);
 
-impl FromPlain for ByteBuf {
+impl FromPlain for Bytes {
     type Err = ParseBinaryError;
 
     #[inline]
-    fn from_plain(s: &str) -> Result<ByteBuf, ParseBinaryError> {
+    fn from_plain(s: &str) -> Result<Self, ParseBinaryError> {
         let buf = STANDARD.decode(s).map_err(ParseBinaryError)?;
-        Ok(ByteBuf::from(buf))
+        Ok(Bytes::from(buf))
     }
 }