Update to edition 2021

Cargo.toml

@@ -2,7 +2,8 @@
 name = "rouille"
 version = "3.6.2"
 authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
+edition = "2021"
 repository = "https://github.com/tomaka/rouille"
 documentation = "http://docs.rs/rouille"
 description = "High-level idiomatic web framework."

examples/database.rs

@@ -7,17 +7,11 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-#[macro_use]
-extern crate rouille;
-extern crate postgres;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-
 use std::sync::Mutex;
 
 use postgres::{Client, NoTls, Transaction};
-
+use rouille::router;
+use rouille::try_or_400;
 use rouille::Request;
 use rouille::Response;
 
@@ -109,7 +103,7 @@ fn note_routes(request: &Request, db: &mut Transaction) -> Response {
         (GET) (/notes) => {
             // This route returns the list of notes. We perform the query and output it as JSON.
 
-            #[derive(Serialize)]
+            #[derive(serde_derive::Serialize)]
             struct Elem { id: String }
 
             let mut out = Vec::new();

examples/git-http-backend.rs

@@ -7,8 +7,6 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-extern crate rouille;
-
 use rouille::cgi::CgiRun;
 use std::env;
 use std::io;

examples/hello-world.rs

@@ -8,8 +8,6 @@
 // according to those terms.
 
 #![allow(unreachable_code)]
-#[macro_use]
-extern crate rouille;
 
 fn main() {
     println!("Now listening on localhost:8000");
@@ -29,7 +27,7 @@ fn main() {
         // the `router!` macro is an expression whose value is the `Response` built by the block
         // that was called. Since `router!` is the last piece of code of this closure, the
         // `Response` is then passed back to the `start_server` function and sent to the client.
-        router!(request,
+        rouille::router!(request,
             (GET) (/) => {
                 // If the request's URL is `/`, we jump here.
                 // This block builds a `Response` object that redirects to the `/hello/world`.

examples/login-session.rs

@@ -1,7 +1,9 @@
+#![allow(dead_code)]
 #![allow(unreachable_code)]
-#[macro_use]
-extern crate rouille;
 
+use rouille::post_input;
+use rouille::router;
+use rouille::try_or_400;
 use rouille::Request;
 use rouille::Response;
 use std::collections::HashMap;
@@ -95,7 +97,7 @@ fn main() {
 fn handle_route(request: &Request, session_data: &mut Option<SessionData>) -> Response {
     // First we handle the routes that are always accessible and always the same, no matter whether
     // the user is logged in or not.
-    router!(request,
+    rouille::router!(request,
         (POST) (/login) => {
             // This is the route that is called when the user wants to log in.
 

examples/php.rs

@@ -7,8 +7,6 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-extern crate rouille;
-
 use rouille::cgi::CgiRun;
 use std::process::Command;
 

examples/reverse-proxy.rs

@@ -7,8 +7,6 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-extern crate rouille;
-
 fn main() {
     // This example shows how to create a reverse proxy with rouille.
 

examples/simple-form.rs

@@ -1,8 +1,9 @@
-#[macro_use]
-extern crate rouille;
-
 use std::io;
 
+use rouille::post_input;
+use rouille::router;
+use rouille::try_or_400;
+
 fn main() {
     // This example demonstrates how to handle HTML forms.
 

examples/static-files.rs

@@ -7,8 +7,6 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-extern crate rouille;
-
 use rouille::Response;
 
 fn main() {

examples/websocket.rs

@@ -7,11 +7,10 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-#[macro_use]
-extern crate rouille;
-
 use std::thread;
 
+use rouille::router;
+use rouille::try_or_400;
 use rouille::websocket;
 use rouille::Response;
 

rouille-multipart/examples/hyper_client.rs

@@ -1,11 +1,8 @@
-extern crate hyper;
-extern crate multipart;
-
 use hyper::client::Request;
 use hyper::method::Method;
 use hyper::net::Streaming;
 
-use multipart::client::Multipart;
+use rouille_multipart::client::Multipart;
 
 use std::io::Read;
 

rouille-multipart/examples/hyper_reqbuilder.rs

@@ -1,9 +1,6 @@
-extern crate hyper;
-extern crate multipart;
-
 use hyper::Client;
 
-use multipart::client::lazy::Multipart;
+use rouille_multipart::client::lazy::Multipart;
 
 fn main() {
     let mut binary = "Hello world in binary!".as_bytes();

rouille-multipart/examples/hyper_server.rs

@@ -1,12 +1,9 @@
-extern crate hyper;
-extern crate multipart;
-
 use hyper::server::response::Response as HyperResponse;
 use hyper::server::{Handler, Request, Response, Server};
 use hyper::status::StatusCode;
-use multipart::mock::StdoutTee;
-use multipart::server::hyper::{HyperRequest, MultipartHandler, Switch};
-use multipart::server::{Entries, Multipart, SaveResult};
+use rouille_multipart::mock::StdoutTee;
+use rouille_multipart::server::hyper::{HyperRequest, MultipartHandler, Switch};
+use rouille_multipart::server::{Entries, Multipart, SaveResult};
 use std::io;
 
 struct NonMultipart;

rouille-multipart/examples/iron.rs

@@ -1,12 +1,9 @@
-extern crate iron;
-extern crate multipart;
-
 extern crate env_logger;
 
 use iron::prelude::*;
 use iron::status;
-use multipart::mock::StdoutTee;
-use multipart::server::{Entries, Multipart, SaveResult};
+use rouille_multipart::mock::StdoutTee;
+use rouille_multipart::server::{Entries, Multipart, SaveResult};
 use std::io::{self, Write};
 
 fn main() {

rouille-multipart/examples/iron_intercept.rs

@@ -1,10 +1,7 @@
-extern crate iron;
-extern crate multipart;
-
 use iron::prelude::*;
 
-use multipart::server::iron::Intercept;
-use multipart::server::Entries;
+use rouille_multipart::server::iron::Intercept;
+use rouille_multipart::server::Entries;
 
 fn main() {
     // We start with a basic request handler chain.

rouille-multipart/examples/nickel.rs

@@ -1,13 +1,10 @@
-extern crate multipart;
-extern crate nickel;
-
 use nickel::status::StatusCode;
 use nickel::{Action, HttpRouter, MiddlewareResult, Nickel, Request, Response};
 use std::io::{self, Write};
 
-use multipart::mock::StdoutTee;
-use multipart::server::nickel::MultipartBody;
-use multipart::server::{Entries, SaveResult};
+use rouille_multipart::mock::StdoutTee;
+use rouille_multipart::server::nickel::MultipartBody;
+use rouille_multipart::server::{Entries, SaveResult};
 
 fn handle_multipart<'mw>(req: &mut Request, mut res: Response<'mw>) -> MiddlewareResult<'mw> {
     match (*req).multipart_body() {

rouille-multipart/examples/tiny_http.rs

@@ -1,8 +1,5 @@
-extern crate multipart;
-extern crate tiny_http;
-
-use multipart::mock::StdoutTee;
-use multipart::server::{Entries, Multipart, SaveResult};
+use rouille_multipart::mock::StdoutTee;
+use rouille_multipart::server::{Entries, Multipart, SaveResult};
 use std::io::{self, Cursor, Write};
 use tiny_http::{Request, Response, StatusCode};
 fn main() {

rouille-multipart/src/bin/form_test.rs

@@ -1,7 +1,4 @@
-extern crate hyper;
-extern crate multipart;
-
-use multipart::server::Multipart;
+use rouille_multipart::server::Multipart;
 
 use hyper::header::ContentType;
 use hyper::server::*;

rouille-multipart/src/client/lazy.rs

@@ -79,10 +79,6 @@ impl<'a> Into<io::Error> for LazyError<'a, io::Error> {
 }
 
 impl<'a, E: Error> Error for LazyError<'a, E> {
-    fn description(&self) -> &str {
-        self.error.description()
-    }
-
     fn cause(&self) -> Option<&dyn Error> {
         Some(&self.error)
     }

rouille-multipart/src/local_test.rs

@@ -4,9 +4,9 @@
 // http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
-use mock::{ClientRequest, HttpBuffer};
+use crate::mock::{ClientRequest, HttpBuffer};
 
-use server::{FieldHeaders, MultipartField, ReadEntry};
+use crate::server::{FieldHeaders, MultipartField, ReadEntry};
 
 use mime::Mime;
 
@@ -226,7 +226,7 @@ impl fmt::Debug for PrintHex {
 
 macro_rules! do_test (
     ($client_test:ident, $server_test:ident) => (
-        ::init_log();
+        crate::init_log();
 
         info!("Client Test: {:?} Server Test: {:?}", stringify!($client_test),
               stringify!($server_test));
@@ -344,7 +344,7 @@ fn gen_bytes() -> Vec<u8> {
 }
 
 fn test_client(test_fields: &TestFields) -> HttpBuffer {
-    use client::Multipart;
+    use crate::client::Multipart;
 
     let request = ClientRequest::default();
 
@@ -392,7 +392,7 @@ fn test_client(test_fields: &TestFields) -> HttpBuffer {
 }
 
 fn test_client_lazy(test_fields: &TestFields) -> HttpBuffer {
-    use client::lazy::Multipart;
+    use crate::client::lazy::Multipart;
 
     let mut multipart = Multipart::new();
 
@@ -441,7 +441,7 @@ fn test_client_lazy(test_fields: &TestFields) -> HttpBuffer {
 }
 
 fn test_server(buf: HttpBuffer, fields: &mut TestFields) {
-    use server::Multipart;
+    use crate::server::Multipart;
 
     let server_buf = buf.for_server();
 
@@ -461,7 +461,7 @@ fn test_server(buf: HttpBuffer, fields: &mut TestFields) {
 }
 
 fn test_server_entry_api(buf: HttpBuffer, fields: &mut TestFields) {
-    use server::Multipart;
+    use crate::server::Multipart;
 
     let server_buf = buf.for_server();
 

rouille-multipart/src/server/boundary.rs

@@ -208,7 +208,7 @@
 
         self.source.consume(consume_amt);
 
         if cfg!(debug_assertions) {}
 
         self.search_idx = 0;
 
@@ -310,7 +310,7 @@
 
     #[test]
     fn test_boundary() {
-        ::init_log();
+        crate::init_log();
 
         debug!("Testing boundary (no split)");
 
@@ -356,7 +356,7 @@
 
     #[test]
     fn test_split_boundary() {
-        ::init_log();
+        crate::init_log();
 
         debug!("Testing boundary (split)");
 
@@ -406,7 +406,7 @@
 
     #[test]
     fn test_empty_body() {
-        ::init_log();
+        crate::init_log();
 
         // empty body contains closing boundary only
         let mut body: &[u8] = b"--boundary--";
@@ -428,7 +428,7 @@
 
     #[test]
     fn test_leading_crlf() {
-        ::init_log();
+        crate::init_log();
 
         let mut body: &[u8] = b"\r\n\r\n--boundary\r\n\
                          asdf1234\
@@ -455,7 +455,7 @@
 
     #[test]
     fn test_trailing_crlf() {
-        ::init_log();
+        crate::init_log();
 
         let mut body: &[u8] = b"--boundary\r\n\
                          asdf1234\
@@ -499,7 +499,7 @@
     // https://github.com/abonander/multipart/issues/93#issuecomment-343610587
     #[test]
     fn test_trailing_lflf() {
-        ::init_log();
+        crate::init_log();
 
         let mut body: &[u8] = b"--boundary\r\n\
                          asdf1234\
@@ -542,7 +542,7 @@
     // https://github.com/abonander/multipart/issues/104
     #[test]
     fn test_unterminated_body() {
-        ::init_log();
+        crate::init_log();
 
         let mut body: &[u8] = b"--boundary\r\n\
                          asdf1234\

rouille-multipart/src/server/mod.rs

@@ -203,7 +203,7 @@ pub trait HttpRequest {
 
 #[test]
 fn issue_104() {
-    ::init_log();
+    crate::init_log();
 
     use std::io::Cursor;
 
@@ -226,7 +226,7 @@ fn issue_104() {
 
 #[test]
 fn issue_114() {
-    ::init_log();
+    crate::init_log();
 
     fn consume_all<R: BufRead>(mut rdr: R) {
         loop {