[pull] master from tomaka:master

Cargo.toml

@@ -17,7 +17,7 @@ ssl = ["tiny_http/ssl"]
 rustls = ["tiny_http/ssl-rustls"]
 
 [dependencies]
-base64 = "0.13"
+base64 = "0.22"
 brotli = { version = "3.3.2", optional = true }
 chrono = { version = "0.4.19", default-features = false, features = ["clock"] }
 filetime = "0.2.0"

examples/database.rs

@@ -85,7 +85,7 @@ fn main() {
         let mut db = db.transaction().unwrap();
 
         // For better readability, we handle the request in a separate function.
-        let response = note_routes(&request, &mut db);
+        let response = note_routes(request, &mut db);
 
         // If the response is a success, we commit the transaction before returning. It's only at
         // this point that data are actually written in the database.
@@ -148,7 +148,7 @@ fn note_routes(request: &Request, db: &mut Transaction) -> Response {
             // This route modifies the content of an existing note.
 
             // We start by reading the body of the HTTP request into a `String`.
-            let body = try_or_400!(rouille::input::plain_text_body(&request));
+            let body = try_or_400!(rouille::input::plain_text_body(request));
 
             // And write the content with a query. This line can only panic if the
             // SQL is malformed.
@@ -168,7 +168,7 @@ fn note_routes(request: &Request, db: &mut Transaction) -> Response {
             // This route creates a new note whose initial content is the body.
 
             // We start by reading the body of the HTTP request into a `String`.
-            let body = try_or_400!(rouille::input::plain_text_body(&request));
+            let body = try_or_400!(rouille::input::plain_text_body(request));
 
             // To do so, we first create a variable that will receive the content.
             let mut id: Option<i32> = None;

examples/git-http-backend.rs

@@ -22,7 +22,7 @@ fn main() {
     println!("Now listening on localhost:8000");
 
     rouille::start_server("localhost:8000", move |request| {
-        rouille::log(&request, io::stdout(), || {
+        rouille::log(request, io::stdout(), || {
             // When a request is received, we invoke the `git http-backend` command through CGI.
             let mut cmd = Command::new("git");
             cmd.arg("http-backend");
@@ -42,7 +42,7 @@ fn main() {
             // Note that an error is returned only if `git http-backend` fails to execute, and not
             // if the client sends bad data for example. In other words, an error can only occur
             // if the server was misconfigured. Therefore it's okay-ish to call `unwrap()` here.
-            cmd.start_cgi(&request).unwrap()
+            cmd.start_cgi(request).unwrap()
         })
     });
 }

examples/login-session.rs

@@ -11,7 +11,7 @@
 // This struct contains the data that we store on the server about each client.
 #[derive(Debug, Clone)]
 struct SessionData {
     login: String,
 }
 
 fn main() {
@@ -34,7 +34,7 @@
     let sessions_storage: Mutex<HashMap<String, SessionData>> = Mutex::new(HashMap::new());
 
     rouille::start_server("localhost:8000", move |request| {
-        rouille::log(&request, io::stdout(), || {
+        rouille::log(request, io::stdout(), || {
             // We call `session::session` in order to assign a unique identifier to each client.
             // This identifier is tracked through a cookie that is automatically appended to the
             // response.
@@ -48,19 +48,19 @@
                 //
                 // We thus obtain a `Option<SessionData>`.
                 let mut session_data = if session.client_has_sid() {
-                    if let Some(data) = sessions_storage.lock().unwrap().get(session.id()) {
-                        Some(data.clone())
-                    } else {
-                        None
-                    }
+                    sessions_storage
+                        .lock()
+                        .unwrap()
+                        .get(session.id())
+                        .map(|data| data.clone())
                 } else {
                     None
                 };
 
                 // Use a separate function to actually handle the request, for readability.
                 // We pass a mutable reference to the `Option<SessionData>` so that the function
                 // is free to modify it.
-                let response = handle_route(&request, &mut session_data);
+                let response = handle_route(request, &mut session_data);
 
                 // Since the function call to `handle_route` can modify the session data, we have
                 // to store it back in the `sessions_storage` when necessary.
@@ -117,7 +117,7 @@
             // In this example all login attempts are successful in the password starts with the
             // letter 'b'. Of course in a real website you should check the credentials in a proper
             // way.
-            if data.password.starts_with("b") {
+            if data.password.starts_with('b') {
                 // Logging the user in is done by writing the content of `session_data`.
                 //
                 // A minor warning here: in this demo we store in memory directly the data that

examples/php.rs

@@ -19,6 +19,6 @@ fn main() {
         cmd.arg("-n"); // Don't use a php.ini.
         cmd.env("SCRIPT_FILENAME", "examples/php-test.php"); // The PHP script to use.
         cmd.env("REDIRECT_STATUS", "1"); // Necessary for security.
-        cmd.start_cgi(&request).unwrap()
+        cmd.start_cgi(request).unwrap()
     });
 }

examples/reverse-proxy.rs

@@ -16,7 +16,7 @@ fn main() {
 
     rouille::start_server("localhost:8000", move |request| {
         rouille::proxy::full_proxy(
-            &request,
+            request,
             rouille::proxy::ProxyConfig {
                 addr: "example.com:80",
                 replace_host: Some("example.com".into()),

examples/simple-form.rs

@@ -11,7 +11,7 @@ fn main() {
     println!("Now listening on localhost:8000");
 
     rouille::start_server("localhost:8000", move |request| {
-        rouille::log(&request, io::stdout(), || {
+        rouille::log(request, io::stdout(), || {
             router!(request,
                 (GET) (/) => {
                     // When viewing the home page, we return an HTML document described below.
@@ -46,7 +46,7 @@ fn main() {
 }
 
 // The HTML document of the home page.
-static FORM: &'static str = r#"
+static FORM: &str = r#"
 <html>
     <head>
         <title>Form</title>

examples/static-files.rs

@@ -25,7 +25,7 @@ fn main() {
             // located.
             // In order to avoid potential security threats, `match_assets` will never return any
             // file outside of this directory even if the URL is for example `/../../foo.txt`.
-            let response = rouille::match_assets(&request, ".");
+            let response = rouille::match_assets(request, ".");
 
             // If a file is found, the `match_assets` function will return a response with a 200
             // status code and the content of the file. If no file is found, it will instead return

examples/websocket.rs

@@ -58,7 +58,7 @@ fn main() {
                 // function, and a `websocket` variable of type `Receiver<Websocket>`.
                 // Once the response has been sent back to the client, the `Receiver` will be
                 // filled by rouille with a `Websocket` object representing the websocket.
-                let (response, websocket) = try_or_400!(websocket::start(&request, Some("echo")));
+                let (response, websocket) = try_or_400!(websocket::start(request, Some("echo")));
 
                 // Because of the nature of I/O in Rust, we need to spawn a separate thread for
                 // each websocket.

src/assets.rs

@@ -77,9 +77,9 @@ use Response;
 /// In this example, a request made to `/static/test.txt` will return the file
 /// `public/test.txt` if it exists.
 ///
-pub fn match_assets<P: ?Sized>(request: &Request, path: &P) -> Response
+pub fn match_assets<P>(request: &Request, path: &P) -> Response
 where
-    P: AsRef<Path>,
+    P: AsRef<Path> + ?Sized,
 {
     let path = path.as_ref();
     let path = match path.canonicalize() {

src/cgi.rs

@@ -118,13 +118,10 @@ impl CgiRun for Command {
             .env("REMOTE_ADDR", &request.remote_addr().to_string())
             .env("AUTH_TYPE", "") // FIXME:
             .env("REMOTE_USER", "") // FIXME:
-            .env(
-                "CONTENT_TYPE",
-                &request.header("Content-Type").unwrap_or(""),
-            )
+            .env("CONTENT_TYPE", request.header("Content-Type").unwrap_or(""))
             .env(
                 "CONTENT_LENGTH",
-                &request.header("Content-Length").unwrap_or(""),
+                request.header("Content-Length").unwrap_or(""),
             )
             .stdout(Stdio::piped())
             .stderr(Stdio::inherit())

src/content_encoding.rs

@@ -64,7 +64,7 @@ pub fn apply(request: &Request, mut response: Response) -> Response {
     if response
         .headers
         .iter()
-        .any(|&(ref key, _)| key.eq_ignore_ascii_case("Content-Encoding"))
+        .any(|(key, _)| key.eq_ignore_ascii_case("Content-Encoding"))
     {
         return response;
     }
@@ -91,7 +91,7 @@ pub fn apply(request: &Request, mut response: Response) -> Response {
 // Since encoding is purely an optimization, it's not a problem if the function sometimes has
 // false positives or false negatives.
 fn response_is_text(response: &Response) -> bool {
-    response.headers.iter().any(|&(ref key, ref value)| {
+    response.headers.iter().any(|(key, value)| {
         if !key.eq_ignore_ascii_case("Content-Type") {
             return false;
         }

src/input/basic_http_auth.rs

@@ -17,7 +17,7 @@
 //! - In order to read a plain text body, see
 //!   [the `plain_text_body` function](fn.plain_text_body.html).
 
-use base64;
+use base64::{prelude::BASE64_STANDARD, Engine as _};
 use Request;
 
 /// Credentials returned by `basic_http_auth`.
@@ -73,7 +73,10 @@ pub fn basic_http_auth(request: &Request) -> Option<HttpAuthCredentials> {
         return None;
     }
 
-    let authvalue = match split.next().and_then(|val| base64::decode(val).ok()) {
+    let authvalue = match split
+        .next()
+        .and_then(|val| BASE64_STANDARD.decode(val).ok())
+    {
         Some(v) => v,
         None => return None,
     };

src/input/cookies.rs

@@ -109,7 +109,7 @@ mod test {
 
         assert_eq!(
             cookies(&request).collect::<Vec<_>>(),
-            vec![("a".into(), "b".into()), ("hello".into(), "world".into())]
+            vec![("a", "b"), ("hello", "world")]
         );
     }
 }

src/input/post.rs

@@ -802,7 +802,7 @@
 
         let input = post_input!(&request, { field: bool }).unwrap();
 
-        assert_eq!(input.field, true);
+        assert!(input.field);
     }
 
     #[test]
@@ -837,7 +837,7 @@
             b"field=value".to_vec(),
         );
 
         let input = post_input!(&request, { field: String });
 
         match input {
             Err(PostError::WrongContentType) => (),
@@ -880,7 +880,7 @@
             b"field=12&field=58".to_vec(),
         );
 
         let input = post_input!(&request, { field: u32 });
 
         match input {
             Err(PostError::Field {
@@ -908,7 +908,7 @@
 
         let input = post_input!(&request, { field: bool }).unwrap();
 
-        assert_eq!(input.field, true);
+        assert!(input.field);
     }
 
     #[test]
@@ -950,7 +950,7 @@
         );
 
         let input = post_input!(&request, {
             field: Vec<u8>
         });
 
         match input {
@@ -1000,7 +1000,7 @@
             b"wrong_field=value".to_vec(),
         );
 
         let input = post_input!(&request, { field: String });
 
         match input {
             Err(PostError::Field {
@@ -1051,7 +1051,7 @@
 
         let input = post_input!(&request, { field: bool }).unwrap();
 
-        assert_eq!(input.field, false);
+        assert!(!input.field);
     }
 
     #[test]
@@ -1092,7 +1092,7 @@
             b"field=12foo".to_vec(),
         );
 
         let input = post_input!(&request, { field: u32 });
 
         match input {
             Err(PostError::Field {
@@ -1141,7 +1141,7 @@
             b"field=800".to_vec(),
         );
 
         let input = post_input!(&request, { field: u8 });
 
         match input {
             Err(PostError::Field {
@@ -1169,7 +1169,7 @@
 
         let _ = request.data();
 
         let input = post_input!(&request, { field: u8 });
 
         match input {
             Err(PostError::BodyAlreadyExtracted) => (),
@@ -1193,7 +1193,7 @@
             b"field=\xc3\x28".to_vec(),
         );
 
         let input = post_input!(&request, { field: String });
 
         match input {
             Err(PostError::NotUtf8(_)) => (),

src/lib.rs

@@ -939,8 +939,8 @@ impl Request {
     pub fn header(&self, key: &str) -> Option<&str> {
         self.headers
             .iter()
-            .find(|&&(ref k, _)| k.eq_ignore_ascii_case(key))
-            .map(|&(_, ref v)| &v[..])
+            .find(|&(k, _)| k.eq_ignore_ascii_case(key))
+            .map(|(_, v)| &v[..])
     }
 
     /// Returns a list of all the headers of the request.
@@ -973,8 +973,8 @@ impl Request {
     /// ```
     pub fn do_not_track(&self) -> Option<bool> {
         match self.header("DNT") {
-            Some(h) if h == "1" => Some(true),
-            Some(h) if h == "0" => Some(false),
+            Some("1") => Some(true),
+            Some("0") => Some(false),
             _ => None,
         }
     }
@@ -1044,7 +1044,7 @@ impl<'a> Iterator for HeadersIter<'a> {
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
-        self.iter.next().map(|&(ref k, ref v)| (&k[..], &v[..]))
+        self.iter.next().map(|(k, v)| (&k[..], &v[..]))
     }
 
     #[inline]

src/response.rs

@@ -503,7 +503,7 @@ impl Response {
     /// Removes all headers from the response that match `header`.
     pub fn without_header(mut self, header: &str) -> Response {
         self.headers
-            .retain(|&(ref h, _)| !h.eq_ignore_ascii_case(header));
+            .retain(|(h, _)| !h.eq_ignore_ascii_case(header));
         self
     }
 
@@ -534,7 +534,7 @@ impl Response {
         let header = header.into();
 
         let mut found_one = false;
-        self.headers.retain(|&(ref h, _)| {
+        self.headers.retain(|(h, _)| {
             if h.eq_ignore_ascii_case(&header) {
                 if !found_one {
                     found_one = true;
@@ -597,7 +597,7 @@ impl Response {
         }
 
         let mut not_modified = false;
-        for &(ref key, ref etag) in &self.headers {
+        for (key, etag) in &self.headers {
             if !key.eq_ignore_ascii_case("ETag") {
                 continue;
             }

src/session.rs

@@ -49,7 +49,7 @@ where
     F: FnOnce(&Session<'r>) -> Response,
 {
     let mut cookie = input::cookies(request);
-    let cookie = cookie.find(|&(ref k, _)| k == &cookie_name);
+    let cookie = cookie.find(|(k, _)| k == &cookie_name);
     let cookie = cookie.map(|(_, v)| v);
 
     let session = if let Some(cookie) = cookie {
@@ -124,9 +124,7 @@ pub fn generate_session_id() -> String {
     rand::thread_rng()
         .sample_iter(&Alphanumeric)
         .map(char::from)
-        .filter(|&c| {
-            ('a'..='z').contains(&c) || ('A'..='Z').contains(&c) || ('0'..='9').contains(&c)
-        })
+        .filter(|&c| c.is_ascii_lowercase() || c.is_ascii_uppercase() || c.is_ascii_digit())
         .take(64)
         .collect::<String>()
 }

src/websocket/mod.rs

@@ -69,7 +69,7 @@ pub use self::websocket::Message;
 pub use self::websocket::SendError;
 pub use self::websocket::Websocket;
 
-use base64;
+use base64::{prelude::BASE64_STANDARD, Engine as _};
 use sha1_smol::Sha1;
 use std::borrow::Cow;
 use std::error;
@@ -152,7 +152,7 @@ where
     // TODO: there are some version shenanigans to handle
     // see https://tools.ietf.org/html/rfc6455#section-4.4
     match request.header("Sec-WebSocket-Version") {
-        Some(h) if h == "13" => (),
+        Some("13") => (),
         _ => return Err(WebsocketError::InvalidWebsocketRequest),
     }
 
@@ -246,5 +246,5 @@ fn convert_key(input: &str) -> String {
     sha1.update(input.as_bytes());
     sha1.update(b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
 
-    base64::encode_config(&sha1.digest().bytes(), base64::STANDARD)
+    BASE64_STANDARD.encode(sha1.digest().bytes())
 }

src/websocket/websocket.rs

@@ -142,7 +142,7 @@ impl Iterator for Websocket {
             // Read `n` bytes in `buf`.
             let mut buf = [0; 256];
             let n = match self.socket.as_mut().unwrap().read(&mut buf) {
-                Ok(n) if n == 0 => {
+                Ok(0) => {
                     // Read returning zero means EOF
                     self.socket = None;
                     return None;