diff --git a/src/response.rs b/src/response.rs index c93d756..910c30f 100644 --- a/src/response.rs +++ b/src/response.rs @@ -521,7 +521,7 @@ fn read_next_line(reader: &mut R) -> IoResult { let byte = reader.bytes().next(); let byte = match byte { - Some(b) => r#try!(b), + Some(b) => b?, None => return Err(IoError::new(ErrorKind::ConnectionAborted, "Unexpected EOF")), }; diff --git a/src/test/mod.rs b/src/test/mod.rs index bc51390..0fffdb8 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -15,7 +15,7 @@ mod range; mod redirect; mod simple; -type RequestHandler = Fn(&Unit) -> Result + Send + 'static; +type RequestHandler = dyn Fn(&Unit) -> Result + Send + 'static; lazy_static! { pub(crate) static ref TEST_HANDLERS: Arc>>> =