Remove use of the 'decl_macro' feature.

Also removes one internal use in the 'typed-uris' codegen test.

README.md

@@ -10,7 +10,7 @@ Rocket is web framework for Rust (nightly) with a focus on ease-of-use,
 expressibility, and speed. Here's an example of a complete Rocket application:
 
 ```rust
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use] extern crate rocket;
 

contrib/lib/src/databases.rs

@@ -50,7 +50,7 @@
 //! In your application's source code, one-time:
 //!
 //! ```rust
-//! #![feature(proc_macro_hygiene, decl_macro)]
+//! #![feature(proc_macro_hygiene)]
 //!
 //! #[macro_use] extern crate rocket;
 //! #[macro_use] extern crate rocket_contrib;
@@ -73,7 +73,7 @@
 //! Whenever a connection to the database is needed:
 //!
 //! ```rust
-//! # #![feature(proc_macro_hygiene, decl_macro)]
+//! # #![feature(proc_macro_hygiene)]
 //! #
 //! # #[macro_use] extern crate rocket;
 //! # #[macro_use] extern crate rocket_contrib;
@@ -289,7 +289,7 @@
 //! connection to a given database:
 //!
 //! ```rust
-//! # #![feature(proc_macro_hygiene, decl_macro)]
+//! # #![feature(proc_macro_hygiene)]
 //! #
 //! # #[macro_use] extern crate rocket;
 //! # #[macro_use] extern crate rocket_contrib;
@@ -311,7 +311,7 @@
 //! connection type:
 //!
 //! ```rust
-//! # #![feature(proc_macro_hygiene, decl_macro)]
+//! # #![feature(proc_macro_hygiene)]
 //! #
 //! # #[macro_use] extern crate rocket;
 //! # #[macro_use] extern crate rocket_contrib;

contrib/lib/src/json.rs

@@ -41,7 +41,7 @@ pub use serde_json::{json_internal, json_internal_vec};
 /// or from [`serde`]. The data is parsed from the HTTP request body.
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # extern crate rocket_contrib;
 /// # type User = usize;
@@ -65,7 +65,7 @@ pub use serde_json::{json_internal, json_internal_vec};
 /// set to `application/json` automatically.
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # extern crate rocket_contrib;
 /// # type User = usize;
@@ -210,7 +210,7 @@ impl<T> DerefMut for Json<T> {
 /// fashion during request handling. This looks something like:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # #[macro_use] extern crate rocket_contrib;
 /// use rocket_contrib::json::JsonValue;
@@ -305,7 +305,7 @@ impl<'a> Responder<'a> for JsonValue {
 /// value created with this macro can be returned from a handler as follows:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # #[macro_use] extern crate rocket_contrib;
 /// use rocket_contrib::json::JsonValue;

contrib/lib/src/msgpack.rs

@@ -40,7 +40,7 @@ pub use rmp_serde::decode::Error;
 /// request body.
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # extern crate rocket_contrib;
 /// # type User = usize;
@@ -64,7 +64,7 @@ pub use rmp_serde::decode::Error;
 /// response is set to `application/msgpack` automatically.
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # extern crate rocket_contrib;
 /// # type User = usize;

contrib/lib/src/templates/metadata.rs

@@ -12,7 +12,7 @@ use crate::templates::ContextManager;
 /// used as a request guard in any request handler.
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # #[macro_use] extern crate rocket_contrib;
 /// use rocket_contrib::templates::{Template, Metadata};
@@ -46,7 +46,7 @@ impl Metadata<'_> {
     /// # Example
     ///
     /// ```rust
-    /// # #![feature(proc_macro_hygiene, decl_macro)]
+    /// # #![feature(proc_macro_hygiene)]
     /// # #[macro_use] extern crate rocket;
     /// # extern crate rocket_contrib;
     /// #
@@ -67,7 +67,7 @@ impl Metadata<'_> {
     /// # Example
     ///
     /// ```rust
-    /// # #![feature(proc_macro_hygiene, decl_macro)]
+    /// # #![feature(proc_macro_hygiene)]
     /// # #[macro_use] extern crate rocket;
     /// # extern crate rocket_contrib;
     /// #

contrib/lib/src/templates/mod.rs

@@ -37,7 +37,7 @@
 //!      of the template file minus the last two extensions, from a handler.
 //!
 //!      ```rust
-//!      # #![feature(proc_macro_hygiene, decl_macro)]
+//!      # #![feature(proc_macro_hygiene)]
 //!      # #[macro_use] extern crate rocket;
 //!      # #[macro_use] extern crate rocket_contrib;
 //!      # fn context() {  }
@@ -179,7 +179,7 @@ const DEFAULT_TEMPLATE_DIR: &str = "templates";
 /// returned from a request handler directly:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # #[macro_use] extern crate rocket_contrib;
 /// # fn context() {  }

contrib/lib/src/uuid.rs

@@ -42,7 +42,7 @@ pub use self::uuid_crate::parser::ParseError;
 /// You can use the `Uuid` type directly as a target of a dynamic parameter:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # #[macro_use] extern crate rocket_contrib;
 /// use rocket_contrib::uuid::Uuid;
@@ -56,7 +56,7 @@ pub use self::uuid_crate::parser::ParseError;
 /// You can also use the `Uuid` as a form value, including in query strings:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// # #[macro_use] extern crate rocket_contrib;
 /// use rocket_contrib::uuid::Uuid;

contrib/lib/tests/compress_responder.rs

@@ -1,4 +1,4 @@
-#![feature(decl_macro, proc_macro_hygiene)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use]
 #[cfg(all(feature = "brotli_compression", feature = "gzip_compression"))]

contrib/lib/tests/compression_fairing.rs

@@ -1,4 +1,4 @@
-#![feature(decl_macro, proc_macro_hygiene)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use]
 #[cfg(all(feature = "brotli_compression", feature = "gzip_compression"))]

contrib/lib/tests/helmet.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use]
 #[cfg(feature = "helmet")]

contrib/lib/tests/static_files.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[cfg(feature = "serve")]
 mod static_tests {

contrib/lib/tests/templates.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[cfg(feature = "templates")]
 #[macro_use] extern crate rocket;

core/codegen/src/lib.rs

@@ -30,7 +30,7 @@
 //! crate root:
 //!
 //! ```rust
-//! #![feature(proc_macro_hygiene, decl_macro)]
+//! #![feature(proc_macro_hygiene)]
 //!
 //! #[macro_use] extern crate rocket;
 //! # #[get("/")] fn hello() { }
@@ -40,7 +40,7 @@
 //! Or, alternatively, selectively import from the top-level scope:
 //!
 //! ```rust
-//! #![feature(proc_macro_hygiene, decl_macro)]
+//! #![feature(proc_macro_hygiene)]
 //! # extern crate rocket;
 //!
 //! use rocket::{get, routes};
@@ -131,7 +131,7 @@ macro_rules! route_attribute {
         /// functions:
         ///
         /// ```rust
-        /// # #![feature(proc_macro_hygiene, decl_macro)]
+        /// # #![feature(proc_macro_hygiene)]
         /// # #[macro_use] extern crate rocket;
         /// #
         /// #[get("/")]
@@ -154,7 +154,7 @@ macro_rules! route_attribute {
         /// explicitly specified:
         ///
         /// ```rust
-        /// # #![feature(proc_macro_hygiene, decl_macro)]
+        /// # #![feature(proc_macro_hygiene)]
         /// # #[macro_use] extern crate rocket;
         /// #
         /// #[route(GET, path = "/")]
@@ -215,7 +215,7 @@ macro_rules! route_attribute {
         /// the arguments `foo`, `baz`, `msg`, `rest`, and `form`:
         ///
         /// ```rust
-        /// # #![feature(proc_macro_hygiene, decl_macro)]
+        /// # #![feature(proc_macro_hygiene)]
         /// # #[macro_use] extern crate rocket;
         /// # use rocket::request::Form;
         /// # use std::path::PathBuf;
@@ -327,7 +327,7 @@ route_attribute!(options => Method::Options);
 /// This attribute can only be applied to free functions:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// use rocket::Request;
@@ -739,7 +739,7 @@ pub fn derive_uri_display_path(input: TokenStream) -> TokenStream {
 /// corresponding [`Route`] structures. For example, given the following routes:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// #[get("/")]
@@ -754,7 +754,7 @@ pub fn derive_uri_display_path(input: TokenStream) -> TokenStream {
 /// The `routes!` macro can be used as:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// # use rocket::http::Method;
@@ -798,7 +798,7 @@ pub fn routes(input: TokenStream) -> TokenStream {
 /// catchers:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// #[catch(404)]
@@ -813,7 +813,7 @@ pub fn routes(input: TokenStream) -> TokenStream {
 /// The `catchers!` macro can be used as:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// # #[catch(404)] fn not_found() { /* .. */ }
@@ -855,7 +855,7 @@ pub fn catchers(input: TokenStream) -> TokenStream {
 /// For example, for the following route:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// #[get("/person/<name>?<age>")]
@@ -869,7 +869,7 @@ pub fn catchers(input: TokenStream) -> TokenStream {
 /// A URI can be created as follows:
 ///
 /// ```rust
-/// # #![feature(proc_macro_hygiene, decl_macro)]
+/// # #![feature(proc_macro_hygiene)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// # #[get("/person/<name>?<age>")]

core/codegen/tests/expansion.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use] extern crate rocket;
 

core/codegen/tests/responder.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 use rocket::local::Client;
 use rocket::response::Responder;

core/codegen/tests/route-data.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use] extern crate rocket;
 

core/codegen/tests/route-format.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use] extern crate rocket;
 

core/codegen/tests/route-ranking.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use] extern crate rocket;
 

core/codegen/tests/route.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 // Rocket sometimes generates mangled identifiers that activate the
 // non_snake_case lint. We deny the lint in this test to ensure that

core/codegen/tests/typed-uris.rs

@@ -1,12 +1,12 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 #![allow(dead_code, unused_variables)]
 
 #[macro_use] extern crate rocket;
 
 use std::path::PathBuf;
 
 use rocket::http::{RawStr, Cookies};
-use rocket::http::uri::{Origin, FromUriParam, Query};
+use rocket::http::uri::{FromUriParam, Query};
 use rocket::request::Form;
 
 #[derive(FromForm, UriDisplayQuery)]
@@ -82,8 +82,10 @@ fn param_and_segments(path: PathBuf, id: usize) { }
 #[post("/a/<id>/then/<path..>")]
 fn guarded_segments(cookies: Cookies<'_>, path: PathBuf, id: usize) { }
 
-macro assert_uri_eq($($uri:expr => $expected:expr,)+) {
-    $(assert_eq!($uri, Origin::parse($expected).expect("valid origin URI"));)+
+macro_rules! assert_uri_eq {
+    ($($uri:expr => $expected:expr,)+) => {
+        $(assert_eq!($uri, rocket::http::uri::Origin::parse($expected).expect("valid origin URI"));)+
+    };
 }
 
 #[test]
@@ -323,8 +325,6 @@ fn check_scoped() {
 }
 
 mod typed_uris {
-    use super::assert_uri_eq;
-
     #[post("/typed_uris/<id>")]
     fn simple(id: i32) { }
 
@@ -339,8 +339,6 @@ mod typed_uris {
     }
 
     pub mod deeper {
-        use super::assert_uri_eq;
-
         #[post("/typed_uris/deeper/<id>")]
         fn simple(id: i32) { }
 

core/codegen/tests/ui-fail/route-attribute-general-syntax.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use] extern crate rocket;
 

core/codegen/tests/ui-fail/route-path-bad-syntax.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use] extern crate rocket;
 

core/codegen/tests/ui-fail/route-type-errors.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_hygiene, decl_macro)]
+#![feature(proc_macro_hygiene)]
 
 #[macro_use] extern crate rocket;