Merge pull request #37 from ThinkChaos/cleanup

Fix warnings and remove unnecessary features

rtsp-2/src/header/types/accept.rs

@@ -3,7 +3,6 @@ use std::convert::TryFrom;
 use std::f32;
 use std::fmt::{Error, Formatter};
 use std::hash::Hash;
-use std::hash::Hasher;
 use std::iter::{once, FromIterator};
 use std::ops::{Deref, DerefMut};
 use std::str;
@@ -266,7 +265,15 @@ impl<'quality> TryFrom<&'quality str> for QualityParam {
 
 impl QualityParam {
     pub fn new(q_value: f32) -> Self {
-        let q_value = q_value.clamp(0.0_f32, 1.0_f32);
+        // clamp value
+        let q_value = if q_value < 0.0 {
+            0.0
+        } else if q_value > 1.0 {
+            1.0
+        } else {
+            q_value
+        };
+
         QualityParam(q_value.to_bits())
     }
 }

rtsp-2/src/header/types/date.rs

@@ -3,7 +3,7 @@ use std::convert::Infallible;
 use std::error::Error;
 use std::fmt::{self, Display, Formatter};
 use std::iter::once;
-use std::ops::{Deref, DerefMut};
+use std::ops::Deref;
 
 use crate::header::common::date::{self, DateTimeError};
 use crate::header::map::TypedHeader;

rtsp-2/src/header/types/expires.rs

@@ -3,7 +3,7 @@ use std::convert::Infallible;
 use std::error::Error;
 use std::fmt::{self, Display, Formatter};
 use std::iter::once;
-use std::ops::{Deref, DerefMut};
+use std::ops::Deref;
 
 use crate::header::common::date::{self, DateTimeError};
 use crate::header::map::TypedHeader;

rtsp-2/src/header/types/transport/interleaved.rs

@@ -144,4 +144,4 @@ fn parse_channel(value: &[u8]) -> Result<(u8, &[u8]), InterleavedError> {
     } else {
         Ok((channel, &value[digits_found..]))
     }
-}
+}

rtsp-2/src/lib.rs

@@ -1,7 +1,4 @@
-#![feature(clamp)]
 #![feature(int_error_matching)]
-#![feature(non_exhaustive)]
-#![feature(type_alias_enum_variants)]
 
 mod syntax;
 

rtsp-2/src/protocol/connection/receiver.rs

@@ -15,7 +15,6 @@ use tokio_timer::Delay;
 use crate::header::map::HeaderMapExtension;
 use crate::header::types::CSeq;
 use crate::protocol::codec::decoder::request::DecodeError as RequestDecodeError;
-use crate::protocol::codec::decoder::response::DecodeError as ResponseDecodeError;
 use crate::protocol::codec::{CodecEvent, DecodeError, Message, ProtocolError};
 use crate::protocol::connection::pending::{PendingRequestResponse, PendingRequestUpdate};
 use crate::protocol::connection::sender::SenderHandle;

rtsp-2/src/protocol/service.rs

@@ -11,7 +11,7 @@ pub struct EmptyService;
 impl Service<Request<BytesMut>> for EmptyService {
     type Response = Response<BytesMut>;
     type Error = io::Error;
-    type Future = Box<Future<Item = Self::Response, Error = Self::Error> + Send + 'static>;
+    type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error> + Send + 'static>;
 
     fn call(&mut self, _: Request<BytesMut>) -> Self::Future {
         Box::new(future::empty())

rtsp-2/src/server.rs

@@ -121,20 +121,13 @@ impl ConnectionService {
             }
             Err(_) => return Box::new(future::ok(BAD_REQUEST_RESPONSE.clone())),
         }
-
-        Box::new(future::ok(
-            Response::<()>::builder()
-                .with_body(BytesMut::new())
-                .build()
-                .unwrap(),
-        ))
     }
 }
 
 impl Service<Request<BytesMut>> for ConnectionService {
     type Response = Response<BytesMut>;
-    type Error = Box<Error + Send + 'static>;
-    type Future = Box<Future<Item = Self::Response, Error = Self::Error> + Send + 'static>;
+    type Error = Box<dyn Error + Send + 'static>;
+    type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error> + Send + 'static>;
 
     fn call(&mut self, mut request: Request<BytesMut>) -> Self::Future {
         request.uri_mut().normalize();

rtsp-2/src/status.rs

@@ -175,11 +175,11 @@ impl StatusCode {
         use self::StatusCodeClass::*;
 
         match u16::from(self) {
-            100...199 => Informational,
-            200...299 => Success,
-            300...399 => Redirection,
-            400...499 => ClientError,
-            500...599 => ServerError,
+            100..=199 => Informational,
+            200..=299 => Success,
+            300..=399 => Redirection,
+            400..=499 => ClientError,
+            500..=599 => ServerError,
             _ => panic!("status code with invalid class"),
         }
     }