From 08bc2d2e76e9d9965c3067d5b5f54dfe92ab7192 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 5 Sep 2016 08:09:23 -0700
Subject: [PATCH] Use constructors to create Bytes and ByteBuf

---
 serde/src/bytes.rs | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/serde/src/bytes.rs b/serde/src/bytes.rs
index 12e42e75..a732712c 100644
--- a/serde/src/bytes.rs
+++ b/serde/src/bytes.rs
@@ -40,18 +40,14 @@ impl<'a> fmt::Debug for Bytes<'a> {
 
 impl<'a> From<&'a [u8]> for Bytes<'a> {
     fn from(bytes: &'a [u8]) -> Self {
-        Bytes {
-            bytes: bytes,
-        }
+        Bytes::new(bytes)
     }
 }
 
 #[cfg(any(feature = "std", feature = "collections"))]
 impl<'a> From<&'a Vec<u8>> for Bytes<'a> {
     fn from(bytes: &'a Vec<u8>) -> Self {
-        Bytes {
-            bytes: bytes,
-        }
+        Bytes::new(bytes)
     }
 }
 
@@ -99,16 +95,12 @@ mod bytebuf {
     impl ByteBuf {
         /// Construct a new, empty `ByteBuf`.
         pub fn new() -> Self {
-            ByteBuf {
-                bytes: Vec::new(),
-            }
+            ByteBuf::from(Vec::new())
         }
 
         /// Construct a new, empty `ByteBuf` with the specified capacity.
         pub fn with_capacity(cap: usize) -> Self {
-            ByteBuf {
-                bytes: Vec::with_capacity(cap)
-            }
+            ByteBuf::from(Vec::with_capacity(cap))
         }
 
         /// Wrap existing bytes in a `ByteBuf`.
@@ -137,9 +129,7 @@ mod bytebuf {
 
     impl From<Vec<u8>> for ByteBuf {
         fn from(bytes: Vec<u8>) -> Self {
-            ByteBuf {
-                bytes: bytes,
-            }
+            ByteBuf::from(bytes)
         }
     }
 
@@ -195,9 +185,7 @@ mod bytebuf {
         fn visit_unit<E>(&mut self) -> Result<ByteBuf, E>
             where E: de::Error,
         {
-            Ok(ByteBuf {
-                bytes: Vec::new(),
-            })
+            Ok(ByteBuf::new())
         }
 
         #[inline]
@@ -213,9 +201,7 @@ mod bytebuf {
 
             try!(visitor.end());
 
-            Ok(ByteBuf {
-                bytes: values,
-            })
+            Ok(ByteBuf::from(values))
         }
 
         #[inline]
@@ -229,9 +215,7 @@ mod bytebuf {
         fn visit_byte_buf<E>(&mut self, v: Vec<u8>) -> Result<ByteBuf, E>
             where E: de::Error,
         {
-            Ok(ByteBuf {
-                bytes: v,
-            })
+            Ok(ByteBuf::from(v))
         }
     }