remove some unsafe code

src/pipeline.rs

@@ -547,7 +547,7 @@ impl<S: 'static, H> ProcessResponse<S, H> {
                             }
                             Ok(Async::Ready(Some(chunk))) => {
                                 self.iostate = IOState::Payload(body);
-                                match io.write(chunk.into()) {
+                                match io.write(&chunk.into()) {
                                     Err(err) => {
                                         info.error = Some(err.into());
                                         return Ok(FinishingMiddlewares::init(
@@ -592,7 +592,7 @@ impl<S: 'static, H> ProcessResponse<S, H> {
                                                 break 'inner;
                                             }
                                             Frame::Chunk(Some(chunk)) => {
-                                                match io.write(chunk) {
+                                                match io.write(&chunk) {
                                                     Err(err) => {
                                                         info.error = Some(err.into());
                                                         return Ok(

src/server/channel.rs

@@ -203,7 +203,6 @@ impl<T> Node<T> {
     }
 
     fn insert<I>(&self, next: &Node<I>) {
-        #[allow(mutable_transmutes)]
         unsafe {
             if let Some(ref next2) = self.next {
                 let n: &mut Node<()> =

src/server/encoding.rs

@@ -701,8 +701,6 @@ pub(crate) struct TransferEncoding {
     kind: TransferEncodingKind,
 }
 
-unsafe impl Send for TransferEncoding {}
-
 #[derive(Debug, PartialEq, Clone)]
 enum TransferEncodingKind {
     /// An Encoder for when Transfer-Encoding includes `chunked`.

src/server/h1writer.rs

@@ -106,7 +106,7 @@ impl<T: AsyncWrite, H: 'static> Writer for H1Writer<T, H> {
     }
 
     #[inline]
-    fn buffer(&self) -> &mut BytesMut {
+    fn buffer(&mut self) -> &mut BytesMut {
         self.buffer.get_mut()
     }
 
@@ -181,35 +181,37 @@ impl<T: AsyncWrite, H: 'static> Writer for H1Writer<T, H> {
             let mut pos = 0;
             let mut has_date = false;
             let mut remaining = buffer.remaining_mut();
-            let mut buf = unsafe { &mut *(buffer.bytes_mut() as *mut [u8]) };
-            for (key, value) in msg.headers() {
-                if is_bin && key == CONTENT_LENGTH {
-                    is_bin = false;
-                    continue;
-                }
-                has_date = has_date || key == DATE;
-                let v = value.as_ref();
-                let k = key.as_str().as_bytes();
-                let len = k.len() + v.len() + 4;
-                if len > remaining {
-                    unsafe { buffer.advance_mut(pos) };
-                    pos = 0;
-                    buffer.reserve(len);
-                    remaining = buffer.remaining_mut();
-                    buf = unsafe { &mut *(buffer.bytes_mut() as *mut _) };
-                }
+            unsafe {
+                let mut buf = &mut *(buffer.bytes_mut() as *mut [u8]);
+                for (key, value) in msg.headers() {
+                    if is_bin && key == CONTENT_LENGTH {
+                        is_bin = false;
+                        continue;
+                    }
+                    has_date = has_date || key == DATE;
+                    let v = value.as_ref();
+                    let k = key.as_str().as_bytes();
+                    let len = k.len() + v.len() + 4;
+                    if len > remaining {
+                        buffer.advance_mut(pos);
+                        pos = 0;
+                        buffer.reserve(len);
+                        remaining = buffer.remaining_mut();
+                        buf = &mut *(buffer.bytes_mut() as *mut _);
+                    }
 
-                buf[pos..pos + k.len()].copy_from_slice(k);
-                pos += k.len();
-                buf[pos..pos + 2].copy_from_slice(b": ");
-                pos += 2;
-                buf[pos..pos + v.len()].copy_from_slice(v);
-                pos += v.len();
-                buf[pos..pos + 2].copy_from_slice(b"\r\n");
-                pos += 2;
-                remaining -= len;
+                    buf[pos..pos + k.len()].copy_from_slice(k);
+                    pos += k.len();
+                    buf[pos..pos + 2].copy_from_slice(b": ");
+                    pos += 2;
+                    buf[pos..pos + v.len()].copy_from_slice(v);
+                    pos += v.len();
+                    buf[pos..pos + 2].copy_from_slice(b"\r\n");
+                    pos += 2;
+                    remaining -= len;
+                }
+                buffer.advance_mut(pos);
             }
-            unsafe { buffer.advance_mut(pos) };
 
             // optimized date header, set_date writes \r\n
             if !has_date {
@@ -233,7 +235,7 @@ impl<T: AsyncWrite, H: 'static> Writer for H1Writer<T, H> {
         Ok(WriterState::Done)
     }
 
-    fn write(&mut self, payload: Binary) -> io::Result<WriterState> {
+    fn write(&mut self, payload: &Binary) -> io::Result<WriterState> {
         self.written += payload.len() as u64;
         if !self.flags.contains(Flags::DISCONNECTED) {
             if self.flags.contains(Flags::STARTED) {

src/server/h2writer.rs

@@ -77,7 +77,7 @@ impl<H: 'static> Writer for H2Writer<H> {
     }
 
     #[inline]
-    fn buffer(&self) -> &mut BytesMut {
+    fn buffer(&mut self) -> &mut BytesMut {
         self.buffer.get_mut()
     }
 
@@ -164,7 +164,7 @@ impl<H: 'static> Writer for H2Writer<H> {
         }
     }
 
-    fn write(&mut self, payload: Binary) -> io::Result<WriterState> {
+    fn write(&mut self, payload: &Binary) -> io::Result<WriterState> {
         self.written = payload.len() as u64;
 
         if !self.flags.contains(Flags::DISCONNECTED) {

src/server/helpers.rs

@@ -7,7 +7,7 @@ use std::{mem, ptr, slice};
 
 use httprequest::HttpInnerMessage;
 
-/// Internal use only! unsafe
+/// Internal use only!
 pub(crate) struct SharedMessagePool(RefCell<VecDeque<Rc<HttpInnerMessage>>>);
 
 impl SharedMessagePool {
@@ -189,14 +189,14 @@ pub fn write_content_length(mut n: usize, bytes: &mut BytesMut) {
 }
 
 pub(crate) fn convert_usize(mut n: usize, bytes: &mut BytesMut) {
-    let mut curr: isize = 39;
-    let mut buf: [u8; 41] = unsafe { mem::uninitialized() };
-    buf[39] = b'\r';
-    buf[40] = b'\n';
-    let buf_ptr = buf.as_mut_ptr();
-    let lut_ptr = DEC_DIGITS_LUT.as_ptr();
-
     unsafe {
+        let mut curr: isize = 39;
+        let mut buf: [u8; 41] = mem::uninitialized();
+        buf[39] = b'\r';
+        buf[40] = b'\n';
+        let buf_ptr = buf.as_mut_ptr();
+        let lut_ptr = DEC_DIGITS_LUT.as_ptr();
+
         // eagerly decode 4 characters at a time
         while n >= 10_000 {
             let rem = (n % 10_000) as isize;
@@ -229,9 +229,7 @@ pub(crate) fn convert_usize(mut n: usize, bytes: &mut BytesMut) {
             curr -= 2;
             ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
         }
-    }
 
-    unsafe {
         bytes.extend_from_slice(slice::from_raw_parts(
             buf_ptr.offset(curr),
             41 - curr as usize,

src/server/mod.rs

@@ -191,15 +191,14 @@ pub trait Writer {
     fn set_date(&self, st: &mut BytesMut);
 
     #[doc(hidden)]
-    #[cfg_attr(feature = "cargo-clippy", allow(mut_from_ref))]
-    fn buffer(&self) -> &mut BytesMut;
+    fn buffer(&mut self) -> &mut BytesMut;
 
     fn start(
         &mut self, req: &mut HttpInnerMessage, resp: &mut HttpResponse,
         encoding: ContentEncoding,
     ) -> io::Result<WriterState>;
 
-    fn write(&mut self, payload: Binary) -> io::Result<WriterState>;
+    fn write(&mut self, payload: &Binary) -> io::Result<WriterState>;
 
     fn write_eof(&mut self) -> io::Result<WriterState>;
 

src/server/shared.rs

@@ -6,58 +6,52 @@ use std::rc::Rc;
 
 use body::Binary;
 
-/// Internal use only! unsafe
 #[derive(Debug)]
-pub(crate) struct SharedBytesPool(RefCell<VecDeque<Rc<BytesMut>>>);
+pub(crate) struct SharedBytesPool(RefCell<VecDeque<BytesMut>>);
 
 impl SharedBytesPool {
     pub fn new() -> SharedBytesPool {
         SharedBytesPool(RefCell::new(VecDeque::with_capacity(128)))
     }
 
-    pub fn get_bytes(&self) -> Rc<BytesMut> {
+    pub fn get_bytes(&self) -> BytesMut {
         if let Some(bytes) = self.0.borrow_mut().pop_front() {
             bytes
         } else {
-            Rc::new(BytesMut::new())
+            BytesMut::new()
         }
     }
 
-    pub fn release_bytes(&self, mut bytes: Rc<BytesMut>) {
+    pub fn release_bytes(&self, mut bytes: BytesMut) {
         let v = &mut self.0.borrow_mut();
         if v.len() < 128 {
-            Rc::get_mut(&mut bytes).unwrap().clear();
+            bytes.clear();
             v.push_front(bytes);
         }
     }
 }
 
 #[derive(Debug)]
-pub(crate) struct SharedBytes(Option<Rc<BytesMut>>, Option<Rc<SharedBytesPool>>);
+pub(crate) struct SharedBytes(Option<BytesMut>, Option<Rc<SharedBytesPool>>);
 
 impl Drop for SharedBytes {
     fn drop(&mut self) {
         if let Some(pool) = self.1.take() {
             if let Some(bytes) = self.0.take() {
-                if Rc::strong_count(&bytes) == 1 {
-                    pool.release_bytes(bytes);
-                }
+                pool.release_bytes(bytes);
             }
         }
     }
 }
 
 impl SharedBytes {
-    pub fn new(bytes: Rc<BytesMut>, pool: Rc<SharedBytesPool>) -> SharedBytes {
+    pub fn new(bytes: BytesMut, pool: Rc<SharedBytesPool>) -> SharedBytes {
         SharedBytes(Some(bytes), Some(pool))
     }
 
-    #[inline(always)]
-    #[allow(mutable_transmutes)]
-    #[cfg_attr(feature = "cargo-clippy", allow(mut_from_ref, inline_always))]
-    pub(crate) fn get_mut(&self) -> &mut BytesMut {
-        let r: &BytesMut = self.0.as_ref().unwrap().as_ref();
-        unsafe { &mut *(r as *const _ as *mut _) }
+    #[inline]
+    pub(crate) fn get_mut(&mut self) -> &mut BytesMut {
+        self.0.as_mut().unwrap()
     }
 
     #[inline]
@@ -75,17 +69,16 @@ impl SharedBytes {
         self.0.as_ref().unwrap().as_ref()
     }
 
-    pub fn split_to(&self, n: usize) -> BytesMut {
+    pub fn split_to(&mut self, n: usize) -> BytesMut {
         self.get_mut().split_to(n)
     }
 
-    pub fn take(&self) -> BytesMut {
+    pub fn take(&mut self) -> BytesMut {
         self.get_mut().take()
     }
 
     #[inline]
-    #[cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
-    pub fn extend(&self, data: Binary) {
+    pub fn extend(&mut self, data: &Binary) {
         let buf = self.get_mut();
         let data = data.as_ref();
         buf.reserve(data.len());
@@ -93,7 +86,7 @@ impl SharedBytes {
     }
 
     #[inline]
-    pub fn extend_from_slice(&self, data: &[u8]) {
+    pub fn extend_from_slice(&mut self, data: &[u8]) {
         let buf = self.get_mut();
         buf.reserve(data.len());
         SharedBytes::put_slice(buf, data);
@@ -117,13 +110,7 @@ impl SharedBytes {
 
 impl Default for SharedBytes {
     fn default() -> Self {
-        SharedBytes(Some(Rc::new(BytesMut::new())), None)
-    }
-}
-
-impl Clone for SharedBytes {
-    fn clone(&self) -> SharedBytes {
-        SharedBytes(self.0.clone(), self.1.clone())
+        SharedBytes(Some(BytesMut::new()), None)
     }
 }
 

src/server/srv.rs

@@ -64,8 +64,6 @@ where
     no_signals: bool,
 }
 
-unsafe impl<H: IntoHttpHandler + 'static> Send for HttpServer<H> {}
-
 enum ServerCommand {
     WorkerDied(usize, Slab<SocketInfo>),
 }
@@ -485,11 +483,9 @@ impl<H: IntoHttpHandler> HttpServer<H> {
         self.exit = true;
         self.no_signals = false;
 
-        let _ = thread::spawn(move || {
-            let sys = System::new("http-server");
-            self.start();
-            sys.run();
-        }).join();
+        let sys = System::new("http-server");
+        self.start();
+        sys.run();
     }
 }
 

src/server/worker.rs

@@ -65,8 +65,6 @@ where
     tcp_ka: Option<time::Duration>,
 }
 
-unsafe impl<H: HttpHandler + 'static> Send for Worker<H> {}
-
 impl<H: HttpHandler + 'static> Worker<H> {
     pub(crate) fn new(
         h: Vec<H>, socks: Slab<SocketInfo>, keep_alive: KeepAlive,