rename BinaryBody

src/body.rs

@@ -11,7 +11,7 @@ pub enum Body {
     /// Empty response. `Content-Length` header is set to `0`
     Empty,
     /// Specific response body.
-    Binary(BinaryBody),
+    Binary(Binary),
     /// Streaming response body with specified length.
     Length(u64),
     /// Unspecified streaming response. Developer is responsible for setting
@@ -24,7 +24,7 @@ pub enum Body {
 /// Represents various types of binary body.
 /// `Content-Length` header is set to length of the body.
 #[derive(Debug)]
-pub enum BinaryBody {
+pub enum Binary {
     /// Bytes body
     Bytes(Bytes),
     /// Static slice
@@ -60,143 +60,143 @@ impl Body {
 
     /// Create body from slice (copy)
     pub fn from_slice(s: &[u8]) -> Body {
-        Body::Binary(BinaryBody::Bytes(Bytes::from(s)))
+        Body::Binary(Binary::Bytes(Bytes::from(s)))
     }
 }
 
-impl<T> From<T> for Body where T: Into<BinaryBody>{
+impl<T> From<T> for Body where T: Into<Binary>{
     fn from(b: T) -> Body {
         Body::Binary(b.into())
     }
 }
 
-impl BinaryBody {
+impl Binary {
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
 
     pub fn len(&self) -> usize {
         match *self {
-            BinaryBody::Bytes(ref bytes) => bytes.len(),
-            BinaryBody::Slice(slice) => slice.len(),
-            BinaryBody::SharedBytes(ref bytes) => bytes.len(),
-            BinaryBody::ArcSharedBytes(ref bytes) => bytes.len(),
-            BinaryBody::SharedString(ref s) => s.len(),
-            BinaryBody::ArcSharedString(ref s) => s.len(),
+            Binary::Bytes(ref bytes) => bytes.len(),
+            Binary::Slice(slice) => slice.len(),
+            Binary::SharedBytes(ref bytes) => bytes.len(),
+            Binary::ArcSharedBytes(ref bytes) => bytes.len(),
+            Binary::SharedString(ref s) => s.len(),
+            Binary::ArcSharedString(ref s) => s.len(),
         }
     }
 
     /// Create binary body from slice
-    pub fn from_slice(s: &[u8]) -> BinaryBody {
-        BinaryBody::Bytes(Bytes::from(s))
+    pub fn from_slice(s: &[u8]) -> Binary {
+        Binary::Bytes(Bytes::from(s))
     }
 }
 
-impl From<&'static str> for BinaryBody {
-    fn from(s: &'static str) -> BinaryBody {
-        BinaryBody::Slice(s.as_ref())
+impl From<&'static str> for Binary {
+    fn from(s: &'static str) -> Binary {
+        Binary::Slice(s.as_ref())
     }
 }
 
-impl From<&'static [u8]> for BinaryBody {
-    fn from(s: &'static [u8]) -> BinaryBody {
-        BinaryBody::Slice(s)
+impl From<&'static [u8]> for Binary {
+    fn from(s: &'static [u8]) -> Binary {
+        Binary::Slice(s)
     }
 }
 
-impl From<Vec<u8>> for BinaryBody {
-    fn from(vec: Vec<u8>) -> BinaryBody {
-        BinaryBody::Bytes(Bytes::from(vec))
+impl From<Vec<u8>> for Binary {
+    fn from(vec: Vec<u8>) -> Binary {
+        Binary::Bytes(Bytes::from(vec))
     }
 }
 
-impl From<String> for BinaryBody {
-    fn from(s: String) -> BinaryBody {
-        BinaryBody::Bytes(Bytes::from(s))
+impl From<String> for Binary {
+    fn from(s: String) -> Binary {
+        Binary::Bytes(Bytes::from(s))
     }
 }
 
-impl<'a> From<&'a String> for BinaryBody {
-    fn from(s: &'a String) -> BinaryBody {
-        BinaryBody::Bytes(Bytes::from(AsRef::<[u8]>::as_ref(&s)))
+impl<'a> From<&'a String> for Binary {
+    fn from(s: &'a String) -> Binary {
+        Binary::Bytes(Bytes::from(AsRef::<[u8]>::as_ref(&s)))
     }
 }
 
-impl From<Bytes> for BinaryBody {
-    fn from(s: Bytes) -> BinaryBody {
-        BinaryBody::Bytes(s)
+impl From<Bytes> for Binary {
+    fn from(s: Bytes) -> Binary {
+        Binary::Bytes(s)
     }
 }
 
-impl From<BytesMut> for BinaryBody {
-    fn from(s: BytesMut) -> BinaryBody {
-        BinaryBody::Bytes(s.freeze())
+impl From<BytesMut> for Binary {
+    fn from(s: BytesMut) -> Binary {
+        Binary::Bytes(s.freeze())
     }
 }
 
-impl From<Rc<Bytes>> for BinaryBody {
-    fn from(body: Rc<Bytes>) -> BinaryBody {
-        BinaryBody::SharedBytes(body)
+impl From<Rc<Bytes>> for Binary {
+    fn from(body: Rc<Bytes>) -> Binary {
+        Binary::SharedBytes(body)
     }
 }
 
-impl<'a> From<&'a Rc<Bytes>> for BinaryBody {
-    fn from(body: &'a Rc<Bytes>) -> BinaryBody {
-        BinaryBody::SharedBytes(Rc::clone(body))
+impl<'a> From<&'a Rc<Bytes>> for Binary {
+    fn from(body: &'a Rc<Bytes>) -> Binary {
+        Binary::SharedBytes(Rc::clone(body))
     }
 }
 
-impl From<Arc<Bytes>> for BinaryBody {
-    fn from(body: Arc<Bytes>) -> BinaryBody {
-        BinaryBody::ArcSharedBytes(body)
+impl From<Arc<Bytes>> for Binary {
+    fn from(body: Arc<Bytes>) -> Binary {
+        Binary::ArcSharedBytes(body)
     }
 }
 
-impl<'a> From<&'a Arc<Bytes>> for BinaryBody {
-    fn from(body: &'a Arc<Bytes>) -> BinaryBody {
-        BinaryBody::ArcSharedBytes(Arc::clone(body))
+impl<'a> From<&'a Arc<Bytes>> for Binary {
+    fn from(body: &'a Arc<Bytes>) -> Binary {
+        Binary::ArcSharedBytes(Arc::clone(body))
     }
 }
 
-impl From<Rc<String>> for BinaryBody {
-    fn from(body: Rc<String>) -> BinaryBody {
-        BinaryBody::SharedString(body)
+impl From<Rc<String>> for Binary {
+    fn from(body: Rc<String>) -> Binary {
+        Binary::SharedString(body)
     }
 }
 
-impl<'a> From<&'a Rc<String>> for BinaryBody {
-    fn from(body: &'a Rc<String>) -> BinaryBody {
-        BinaryBody::SharedString(Rc::clone(body))
+impl<'a> From<&'a Rc<String>> for Binary {
+    fn from(body: &'a Rc<String>) -> Binary {
+        Binary::SharedString(Rc::clone(body))
     }
 }
 
-impl From<Arc<String>> for BinaryBody {
-    fn from(body: Arc<String>) -> BinaryBody {
-        BinaryBody::ArcSharedString(body)
+impl From<Arc<String>> for Binary {
+    fn from(body: Arc<String>) -> Binary {
+        Binary::ArcSharedString(body)
     }
 }
 
-impl<'a> From<&'a Arc<String>> for BinaryBody {
-    fn from(body: &'a Arc<String>) -> BinaryBody {
-        BinaryBody::ArcSharedString(Arc::clone(body))
+impl<'a> From<&'a Arc<String>> for Binary {
+    fn from(body: &'a Arc<String>) -> Binary {
+        Binary::ArcSharedString(Arc::clone(body))
     }
 }
 
-impl AsRef<[u8]> for BinaryBody {
+impl AsRef<[u8]> for Binary {
     fn as_ref(&self) -> &[u8] {
         match *self {
-            BinaryBody::Bytes(ref bytes) => bytes.as_ref(),
-            BinaryBody::Slice(slice) => slice,
-            BinaryBody::SharedBytes(ref bytes) => bytes.as_ref(),
-            BinaryBody::ArcSharedBytes(ref bytes) => bytes.as_ref(),
-            BinaryBody::SharedString(ref s) => s.as_bytes(),
-            BinaryBody::ArcSharedString(ref s) => s.as_bytes(),
+            Binary::Bytes(ref bytes) => bytes.as_ref(),
+            Binary::Slice(slice) => slice,
+            Binary::SharedBytes(ref bytes) => bytes.as_ref(),
+            Binary::ArcSharedBytes(ref bytes) => bytes.as_ref(),
+            Binary::SharedString(ref s) => s.as_bytes(),
+            Binary::ArcSharedString(ref s) => s.as_bytes(),
         }
     }
 }
 
-impl From<BinaryBody> for Frame {
-    fn from(b: BinaryBody) -> Frame {
+impl From<Binary> for Frame {
+    fn from(b: Binary) -> Frame {
         Frame::Payload(Some(b))
     }
 }
@@ -207,70 +207,70 @@ mod tests {
 
     #[test]
     fn test_static_str() {
-        assert_eq!(BinaryBody::from("test").len(), 4);
-        assert_eq!(BinaryBody::from("test").as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from("test").len(), 4);
+        assert_eq!(Binary::from("test").as_ref(), "test".as_bytes());
     }
 
     #[test]
     fn test_static_bytes() {
-        assert_eq!(BinaryBody::from(b"test".as_ref()).len(), 4);
-        assert_eq!(BinaryBody::from(b"test".as_ref()).as_ref(), "test".as_bytes());
-        assert_eq!(BinaryBody::from_slice(b"test".as_ref()).len(), 4);
-        assert_eq!(BinaryBody::from_slice(b"test".as_ref()).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(b"test".as_ref()).len(), 4);
+        assert_eq!(Binary::from(b"test".as_ref()).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from_slice(b"test".as_ref()).len(), 4);
+        assert_eq!(Binary::from_slice(b"test".as_ref()).as_ref(), "test".as_bytes());
     }
 
     #[test]
     fn test_vec() {
-        assert_eq!(BinaryBody::from(Vec::from("test")).len(), 4);
-        assert_eq!(BinaryBody::from(Vec::from("test")).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(Vec::from("test")).len(), 4);
+        assert_eq!(Binary::from(Vec::from("test")).as_ref(), "test".as_bytes());
     }
 
     #[test]
     fn test_bytes() {
-        assert_eq!(BinaryBody::from(Bytes::from("test")).len(), 4);
-        assert_eq!(BinaryBody::from(Bytes::from("test")).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(Bytes::from("test")).len(), 4);
+        assert_eq!(Binary::from(Bytes::from("test")).as_ref(), "test".as_bytes());
     }
 
     #[test]
     fn test_rc_bytes() {
         let b = Rc::new(Bytes::from("test"));
-        assert_eq!(BinaryBody::from(b.clone()).len(), 4);
-        assert_eq!(BinaryBody::from(b.clone()).as_ref(), "test".as_bytes());
-        assert_eq!(BinaryBody::from(&b).len(), 4);
-        assert_eq!(BinaryBody::from(&b).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(b.clone()).len(), 4);
+        assert_eq!(Binary::from(b.clone()).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(&b).len(), 4);
+        assert_eq!(Binary::from(&b).as_ref(), "test".as_bytes());
     }
 
     #[test]
     fn test_ref_string() {
         let b = Rc::new("test".to_owned());
-        assert_eq!(BinaryBody::from(&b).len(), 4);
-        assert_eq!(BinaryBody::from(&b).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(&b).len(), 4);
+        assert_eq!(Binary::from(&b).as_ref(), "test".as_bytes());
     }
 
     #[test]
     fn test_rc_string() {
         let b = Rc::new("test".to_owned());
-        assert_eq!(BinaryBody::from(b.clone()).len(), 4);
-        assert_eq!(BinaryBody::from(b.clone()).as_ref(), "test".as_bytes());
-        assert_eq!(BinaryBody::from(&b).len(), 4);
-        assert_eq!(BinaryBody::from(&b).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(b.clone()).len(), 4);
+        assert_eq!(Binary::from(b.clone()).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(&b).len(), 4);
+        assert_eq!(Binary::from(&b).as_ref(), "test".as_bytes());
     }
 
     #[test]
     fn test_arc_bytes() {
         let b = Arc::new(Bytes::from("test"));
-        assert_eq!(BinaryBody::from(b.clone()).len(), 4);
-        assert_eq!(BinaryBody::from(b.clone()).as_ref(), "test".as_bytes());
-        assert_eq!(BinaryBody::from(&b).len(), 4);
-        assert_eq!(BinaryBody::from(&b).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(b.clone()).len(), 4);
+        assert_eq!(Binary::from(b.clone()).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(&b).len(), 4);
+        assert_eq!(Binary::from(&b).as_ref(), "test".as_bytes());
     }
 
     #[test]
     fn test_arc_string() {
         let b = Arc::new("test".to_owned());
-        assert_eq!(BinaryBody::from(b.clone()).len(), 4);
-        assert_eq!(BinaryBody::from(b.clone()).as_ref(), "test".as_bytes());
-        assert_eq!(BinaryBody::from(&b).len(), 4);
-        assert_eq!(BinaryBody::from(&b).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(b.clone()).len(), 4);
+        assert_eq!(Binary::from(b.clone()).as_ref(), "test".as_bytes());
+        assert_eq!(Binary::from(&b).len(), 4);
+        assert_eq!(Binary::from(&b).as_ref(), "test".as_bytes());
     }
 }