Update features for latest nightly.

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_non_items, proc_macro_gen, decl_macro)]
+#![feature(proc_macro_hygiene, decl_macro)]
 
 #[macro_use] extern crate rocket;
 

contrib/lib/src/databases.rs

@@ -74,7 +74,7 @@
 //! Whenever a connection to the database is needed:
 //!
 //! ```rust
-//! # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+//! # #![feature(proc_macro_hygiene, decl_macro)]
 //! #
 //! # #[macro_use] extern crate rocket;
 //! # extern crate rocket_contrib;
@@ -262,7 +262,7 @@
 //! connection to a given database:
 //!
 //! ```rust
-//! # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+//! # #![feature(proc_macro_hygiene, decl_macro)]
 //! #
 //! # #[macro_use] extern crate rocket;
 //! # extern crate rocket_contrib;
@@ -283,7 +283,7 @@
 //! connection type:
 //!
 //! ```rust
-//! # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+//! # #![feature(proc_macro_hygiene, decl_macro)]
 //! #
 //! # #[macro_use] extern crate rocket;
 //! # extern crate rocket_contrib;

contrib/lib/src/msgpack.rs

@@ -27,7 +27,7 @@ pub use self::rmp_serde::decode::Error as MsgPackError;
 /// HTTP request body.
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # extern crate rocket_contrib;
 /// # type User = usize;
@@ -54,7 +54,7 @@ pub use self::rmp_serde::decode::Error as MsgPackError;
 /// is set to `application/msgpack` automatically.
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # extern crate rocket_contrib;
 /// # type User = usize;

contrib/lib/src/templates/metadata.rs

@@ -30,7 +30,7 @@ use super::ContextManager;
 /// can be used as a request guard in any request handler.
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # #[macro_use] extern crate rocket_contrib;
 /// # fn main() {  }

contrib/lib/tests/static_files.rs

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

contrib/lib/tests/templates.rs

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

core/codegen_next/Cargo.toml

@@ -9,6 +9,7 @@ repository = "https://github.com/SergioBenitez/Rocket"
 readme = "../../README.md"
 keywords = ["rocket", "web", "framework", "code", "generation"]
 license = "MIT/Apache-2.0"
+build = "../lib/build.rs"
 
 # if publishing, add to config scripts
 publish = false
@@ -21,6 +22,10 @@ indexmap = "1.0"
 quote = "0.6.1"
 rocket_http = { version = "0.4.0-dev", path = "../http/" }
 
+[build-dependencies]
+yansi = "0.4"
+version_check = "0.1.3"
+
 [dependencies.derive_utils]
 git = "https://github.com/SergioBenitez/derive-utils"
 rev = "62f361f"

core/codegen_next/tests/other-route.rs

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

core/codegen_next/tests/responder.rs

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

core/codegen_next/tests/route-data.rs

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

core/codegen_next/tests/route-format.rs

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

core/codegen_next/tests/route-ranking.rs

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

core/codegen_next/tests/route.rs

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

core/codegen_next/tests/typed-uris.rs

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

core/codegen_next/tests/ui-fail/catchers.rs

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

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

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

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

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

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

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

core/codegen_next/tests/ui-fail/route-warnings.rs

@@ -1,6 +1,6 @@
 // must-compile-successfully
 
-#![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+#![feature(proc_macro_hygiene, decl_macro)]
 
 #[macro_use] extern crate rocket;
 

core/codegen_next/tests/ui-fail/routes.rs

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

core/codegen_next/tests/ui-fail/typed-uri-bad-type.rs

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

core/codegen_next/tests/ui-fail/typed-uris-bad-params.rs

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

core/codegen_next/tests/ui-fail/typed-uris-invalid-syntax.rs

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

core/http/Cargo.toml

@@ -25,7 +25,7 @@ indexmap = "1.0"
 rustls = { version = "0.13", optional = true }
 state = "0.4"
 cookie = { version = "0.11", features = ["percent-encode", "secure"] }
-pear = { git = "http://github.com/SergioBenitez/Pear", rev = "b475140" }
+pear = { git = "http://github.com/SergioBenitez/Pear", rev = "d221e16dd" }
 unicode-xid = "0.1"
 
 [dependencies.hyper-sync-rustls]

core/http/src/cookies.rs

@@ -35,7 +35,7 @@ use Header;
 /// a handler to retrieve the value of a "message" cookie.
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// use rocket::http::Cookies;
 ///
@@ -55,7 +55,7 @@ use Header;
 /// [private cookie]: /rocket/http/enum.Cookies.html#private-cookies
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro, never_type)]
+/// # #![feature(proc_macro_hygiene, decl_macro, never_type)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// use rocket::http::Status;

core/http/src/lib.rs

@@ -1,5 +1,5 @@
 #![feature(specialization)]
-#![feature(proc_macro_non_items)]
+#![feature(proc_macro_hygiene)]
 #![feature(try_from)]
 #![feature(crate_visibility_modifier)]
 #![recursion_limit="512"]

core/http/src/uri/uri_display.rs

@@ -105,7 +105,7 @@ use self::priv_encode_set::PATH_ENCODE_SET;
 /// dynamic parameter type.
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # fn main() {  }
 /// use rocket::http::RawStr;

core/lib/Cargo.toml

@@ -28,7 +28,7 @@ state = "0.4.1"
 time = "0.1"
 memchr = "2" # TODO: Use pear instead.
 base64 = "0.9"
-pear = { git = "http://github.com/SergioBenitez/Pear", rev = "b475140" }
+pear = { git = "http://github.com/SergioBenitez/Pear", rev = "d221e16dd" }
 isatty = "0.1"
 
 [dev-dependencies]

core/lib/benches/format-routing.rs

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

core/lib/benches/ranked-routing.rs

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

core/lib/benches/simple-routing.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+#![feature(proc_macro_hygiene, decl_macro)]
 // #![feature(alloc_system)]
 // extern crate alloc_system;
 

core/lib/build.rs

@@ -8,8 +8,8 @@ use yansi::Color::{Red, Yellow, Blue, White};
 use version_check::{supports_features, is_min_version, is_min_date};
 
 // Specifies the minimum nightly version needed to compile Rocket.
-const MIN_DATE: &'static str = "2018-08-17";
-const MIN_VERSION: &'static str = "1.30.0-nightly";
+const MIN_DATE: &'static str = "2018-10-05";
+const MIN_VERSION: &'static str = "1.31.0-nightly";
 
 fn main() {
     let ok_channel = supports_features();

core/lib/src/catcher.rs

@@ -33,7 +33,7 @@ use yansi::Color::*;
 /// declared using the `catch` decorator, as follows:
 ///
 /// ```rust
-/// #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// #![feature(proc_macro_hygiene, decl_macro)]
 ///
 /// #[macro_use] extern crate rocket;
 ///

core/lib/src/data/data.rs

@@ -31,7 +31,7 @@ const PEEK_BYTES: usize = 512;
 /// route parameter as follows:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # type DataGuard = ::rocket::data::Data;
 /// #[post("/submit", data = "<var>")]

core/lib/src/data/from_data.rs

@@ -130,7 +130,7 @@ pub type Transformed<'a, T> =
 /// if the guard returns successfully.
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # type DataGuard = ::rocket::data::Data;
 /// #[post("/submit", data = "<var>")]
@@ -176,7 +176,7 @@ pub type Transformed<'a, T> =
 /// `String` (an `&str`).
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # #[derive(Debug)]
 /// # struct Name<'a> { first: &'a str, last: &'a str, }
@@ -422,7 +422,7 @@ impl<'f> FromData<'f> for Data {
 /// that you can retrieve it directly from a client's request body:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # type Person = ::rocket::data::Data;
 /// #[post("/person", data = "<person>")]
@@ -434,7 +434,7 @@ impl<'f> FromData<'f> for Data {
 /// A `FromDataSimple` implementation allowing this looks like:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// # #[derive(Debug)]

core/lib/src/handler.rs

@@ -86,7 +86,7 @@ pub type Outcome<'r> = outcome::Outcome<Response<'r>, Status, Data>;
 /// managed state and a static route, as follows:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// # #[derive(Copy, Clone)]

core/lib/src/lib.rs

@@ -3,7 +3,7 @@
 #![feature(try_trait)]
 #![feature(fnbox)]
 #![feature(never_type)]
-#![feature(proc_macro_non_items)]
+#![feature(proc_macro_hygiene)]
 #![feature(crate_visibility_modifier)]
 #![feature(try_from)]
 #![feature(label_break_value)]
@@ -54,7 +54,7 @@
 //! Then, add the following to the top of your `main.rs` file:
 //!
 //! ```rust
-//! #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+//! #![feature(proc_macro_hygiene, decl_macro)]
 //!
 //! #[macro_use] extern crate rocket;
 //! #
@@ -67,7 +67,7 @@
 //! write Rocket applications. Here's a simple example to get you started:
 //!
 //! ```rust
-//! #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+//! #![feature(proc_macro_hygiene, decl_macro)]
 //!
 //! #[macro_use] extern crate rocket;
 //!

core/lib/src/local/mod.rs

@@ -67,7 +67,7 @@
 //! consider the following complete "Hello, world!" application, with testing.
 //!
 //! ```rust
-//! #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+//! #![feature(proc_macro_hygiene, decl_macro)]
 //!
 //! #[macro_use] extern crate rocket;
 //!

core/lib/src/request/form/form.rs

@@ -42,7 +42,7 @@ use http::{Status, uri::FromUriParam};
 /// can access fields of `T` transparently through a `Form<T>`:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #![allow(deprecated, unused_attributes)]
 /// # #[macro_use] extern crate rocket;
 /// use rocket::request::Form;
@@ -71,7 +71,7 @@ use http::{Status, uri::FromUriParam};
 /// A handler that handles a form of this type can similarly by written:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #![allow(deprecated, unused_attributes)]
 /// # #[macro_use] extern crate rocket;
 /// # use rocket::request::Form;
@@ -125,7 +125,7 @@ impl<T> Form<T> {
     /// # Example
     ///
     /// ```rust
-    /// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+    /// # #![feature(proc_macro_hygiene, decl_macro)]
     /// # #[macro_use] extern crate rocket;
     /// use rocket::request::Form;
     ///

core/lib/src/request/form/from_form.rs

@@ -12,7 +12,7 @@ use request::FormItems;
 /// automatic validation.
 ///
 /// ```rust
-/// #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// #![feature(proc_macro_hygiene, decl_macro)]
 /// # #![allow(deprecated, dead_code, unused_attributes)]
 ///
 /// #[macro_use] extern crate rocket;
@@ -31,7 +31,7 @@ use request::FormItems;
 /// data via the `data` parameter and `Form` type.
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #![allow(deprecated, dead_code, unused_attributes)]
 /// # #[macro_use] extern crate rocket;
 /// # use rocket::request::Form;

core/lib/src/request/form/lenient.rs

@@ -31,7 +31,7 @@ use http::uri::FromUriParam;
 /// handler:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #![allow(deprecated, unused_attributes)]
 /// # #[macro_use] extern crate rocket;
 /// use rocket::request::LenientForm;
@@ -68,7 +68,7 @@ impl<T> LenientForm<T> {
     /// # Example
     ///
     /// ```rust
-    /// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+    /// # #![feature(proc_macro_hygiene, decl_macro)]
     /// # #[macro_use] extern crate rocket;
     /// use rocket::request::LenientForm;
     ///

core/lib/src/request/from_request.rs

@@ -166,7 +166,7 @@ impl<S, E> IntoOutcome<S, (Status, E), ()> for Result<S, E> {
 /// `sensitive` handler.
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// use rocket::Outcome;
@@ -221,7 +221,7 @@ impl<S, E> IntoOutcome<S, (Status, E), ()> for Result<S, E> {
 /// routes (`admin_dashboard` and `user_dashboard`):
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// # use rocket::outcome::{IntoOutcome, Outcome};
@@ -283,7 +283,7 @@ impl<S, E> IntoOutcome<S, (Status, E), ()> for Result<S, E> {
 /// used, as illustrated below:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #![feature(never_type)]
 /// # #[macro_use] extern crate rocket;
 /// #

core/lib/src/request/param.rs

@@ -19,7 +19,7 @@ use http::{RawStr, uri::{Segments, SegmentError}};
 /// handler for the dynamic `"/<id>"` path:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// #[get("/<id>")]
 /// fn hello(id: usize) -> String {
@@ -54,7 +54,7 @@ use http::{RawStr, uri::{Segments, SegmentError}};
 /// parameter as follows:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # use rocket::http::RawStr;
 /// #[get("/<id>")]
@@ -166,7 +166,7 @@ use http::{RawStr, uri::{Segments, SegmentError}};
 /// dynamic path segment:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// # use rocket::request::FromParam;
 /// # use rocket::http::RawStr;

core/lib/src/request/state.rs

@@ -21,7 +21,7 @@ use http::Status;
 /// following example does just this:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// use rocket::State;
 ///

core/lib/src/response/flash.rs

@@ -47,7 +47,7 @@ const FLASH_COOKIE_NAME: &str = "_flash";
 /// message on both the request and response sides.
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// use rocket::response::{Flash, Redirect};
 /// use rocket::request::FlashMessage;

core/lib/src/response/responder.rs

@@ -151,7 +151,7 @@ use request::Request;
 /// following `Responder` implementation accomplishes this:
 ///
 /// ```rust
-/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+/// # #![feature(proc_macro_hygiene, decl_macro)]
 /// # #[macro_use] extern crate rocket;
 /// #
 /// # #[derive(Debug)]

core/lib/src/rocket.rs

@@ -455,7 +455,7 @@ impl Rocket {
     /// dispatched to the `hi` route.
     ///
     /// ```rust
-    /// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+    /// # #![feature(proc_macro_hygiene, decl_macro)]
     /// # #[macro_use] extern crate rocket;
     /// #
     /// #[get("/world")]
@@ -526,7 +526,7 @@ impl Rocket {
     /// # Examples
     ///
     /// ```rust
-    /// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+    /// # #![feature(proc_macro_hygiene, decl_macro)]
     /// # #[macro_use] extern crate rocket;
     /// use rocket::Request;
     ///
@@ -582,7 +582,7 @@ impl Rocket {
     /// # Example
     ///
     /// ```rust
-    /// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+    /// # #![feature(proc_macro_hygiene, decl_macro)]
     /// # #[macro_use] extern crate rocket;
     /// use rocket::State;
     ///
@@ -619,7 +619,7 @@ impl Rocket {
     /// # Example
     ///
     /// ```rust
-    /// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+    /// # #![feature(proc_macro_hygiene, decl_macro)]
     /// # #[macro_use] extern crate rocket;
     /// use rocket::Rocket;
     /// use rocket::fairing::AdHoc;
@@ -735,7 +735,7 @@ impl Rocket {
     /// # Example
     ///
     /// ```rust
-    /// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+    /// # #![feature(proc_macro_hygiene, decl_macro)]
     /// # #[macro_use] extern crate rocket;
     /// use rocket::Rocket;
     /// use rocket::fairing::AdHoc;
@@ -791,7 +791,7 @@ impl Rocket {
     /// # Example
     ///
     /// ```rust
-    /// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+    /// # #![feature(proc_macro_hygiene, decl_macro)]
     /// # #[macro_use] extern crate rocket;
     /// use rocket::Rocket;
     /// use rocket::fairing::AdHoc;

core/lib/tests/absolute-uris-okay-issue-443.rs

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

core/lib/tests/fairing_before_head_strip-issue-546.rs

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

core/lib/tests/flash-lazy-removes-issue-466.rs

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

core/lib/tests/form_method-issue-45.rs

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

core/lib/tests/form_value_decoding-issue-82.rs

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

core/lib/tests/head_handling.rs

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

core/lib/tests/limits.rs

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

core/lib/tests/local-request-content-type-issue-505.rs

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

core/lib/tests/local_request_private_cookie-issue-368.rs

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

core/lib/tests/nested-fairing-attaches.rs

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

core/lib/tests/precise-content-type-matching.rs

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

core/lib/tests/redirect_from_catcher-issue-113.rs

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

core/lib/tests/responder_lifetime-issue-345.rs

@@ -1,4 +1,4 @@
-#![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+#![feature(proc_macro_hygiene, decl_macro)]
 #![allow(dead_code)] // This test is only here so that we can ensure it compiles.
 
 #[macro_use] extern crate rocket;

core/lib/tests/route_guard.rs

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

core/lib/tests/segments-issues-41-86.rs

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

core/lib/tests/strict_and_lenient_forms.rs

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

examples/config/tests/development.rs

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

examples/config/tests/production.rs

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

examples/config/tests/staging.rs

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

examples/content_types/src/main.rs

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

examples/cookies/src/main.rs

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

examples/errors/src/main.rs

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

examples/fairings/src/main.rs

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

examples/form_kitchen_sink/src/main.rs

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

examples/form_validation/src/main.rs

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

examples/handlebars_templates/src/main.rs

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

examples/hello_2018/src/main.rs

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

examples/hello_person/src/main.rs

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

examples/hello_world/src/main.rs

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

examples/json/src/main.rs

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

examples/managed_queue/src/main.rs

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

examples/msgpack/src/main.rs

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

examples/optional_redirect/src/main.rs

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

examples/pastebin/src/main.rs

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

examples/query_params/src/main.rs

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

examples/ranking/src/main.rs

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

examples/raw_sqlite/src/main.rs

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

examples/raw_upload/src/main.rs

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

examples/redirect/src/main.rs

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

examples/request_guard/src/main.rs

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

examples/request_local_state/src/main.rs

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

examples/session/src/main.rs

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

examples/state/src/main.rs

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

examples/stream/src/main.rs

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

examples/tera_templates/src/main.rs

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

examples/testing/src/main.rs

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

examples/tls/src/main.rs

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

examples/todo/src/main.rs

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

examples/uuid/src/main.rs

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

site/guide/getting-started.md

@@ -61,7 +61,7 @@ Modify `src/main.rs` so that it contains the code for the Rocket `Hello, world!`
 program, reproduced below:
 
 ```rust
-#![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+#![feature(proc_macro_hygiene, decl_macro)]
 
 #[macro_use] extern crate rocket;
 

site/guide/overview.md

@@ -138,7 +138,7 @@ We typically call `launch` from the `main` function. Our complete _Hello,
 world!_ application thus looks like:
 
 ```rust
-#![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+#![feature(proc_macro_hygiene, decl_macro)]
 
 #[macro_use] extern crate rocket;
 

site/guide/pastebin.md

@@ -51,7 +51,7 @@ And finally, create a skeleton Rocket application to work off of in
 `src/main.rs`:
 
 ```rust
-#![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+#![feature(proc_macro_hygiene, decl_macro)]
 
 #[macro_use] extern crate rocket;
 

site/index.toml

@@ -44,7 +44,7 @@ margin = 9
 [[sections]]
 title = "Hello, Rocket!"
 code = '''
-  #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)]
+  #![feature(proc_macro_hygiene, decl_macro)]
 
   #[macro_use] extern crate rocket;