Update to edition 2021

Rouille does not currently specify an edition. Set it to 2021 and update
to newer idioms, including:

* Remove unneeded `extern crate`
* Remove `fn main() { /* ... */ }` in doctests
* Replace `#[macro_use]` with direct imports
* Fix or `#[allow]` warnings

Include the rouille-multipart vendored directory in this upgrade

Author: tgross35

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;