From 2839aca8ce1a95e47d678343410bc64d3e5938cf Mon Sep 17 00:00:00 2001 From: Sergio Benitez Date: Fri, 5 Oct 2018 21:56:46 -0700 Subject: [PATCH] Update features for latest nightly. --- README.md | 2 +- contrib/lib/src/databases.rs | 6 +++--- contrib/lib/src/msgpack.rs | 4 ++-- contrib/lib/src/templates/metadata.rs | 2 +- contrib/lib/tests/static_files.rs | 2 +- contrib/lib/tests/templates.rs | 2 +- core/codegen_next/Cargo.toml | 5 +++++ core/codegen_next/tests/other-route.rs | 2 +- core/codegen_next/tests/responder.rs | 2 +- core/codegen_next/tests/route-data.rs | 2 +- core/codegen_next/tests/route-format.rs | 2 +- core/codegen_next/tests/route-ranking.rs | 2 +- core/codegen_next/tests/route.rs | 2 +- core/codegen_next/tests/typed-uris.rs | 2 +- core/codegen_next/tests/ui-fail/catchers.rs | 2 +- .../tests/ui-fail/route-attribute-general-syntax.rs | 2 +- .../tests/ui-fail/route-path-bad-syntax.rs | 2 +- core/codegen_next/tests/ui-fail/route-type-errors.rs | 2 +- core/codegen_next/tests/ui-fail/route-warnings.rs | 2 +- core/codegen_next/tests/ui-fail/routes.rs | 2 +- .../codegen_next/tests/ui-fail/typed-uri-bad-type.rs | 2 +- .../tests/ui-fail/typed-uris-bad-params.rs | 2 +- .../tests/ui-fail/typed-uris-invalid-syntax.rs | 2 +- core/http/Cargo.toml | 2 +- core/http/src/cookies.rs | 4 ++-- core/http/src/lib.rs | 2 +- core/http/src/uri/uri_display.rs | 2 +- core/lib/Cargo.toml | 2 +- core/lib/benches/format-routing.rs | 2 +- core/lib/benches/ranked-routing.rs | 2 +- core/lib/benches/simple-routing.rs | 2 +- core/lib/build.rs | 4 ++-- core/lib/src/catcher.rs | 2 +- core/lib/src/data/data.rs | 2 +- core/lib/src/data/from_data.rs | 8 ++++---- core/lib/src/handler.rs | 2 +- core/lib/src/lib.rs | 6 +++--- core/lib/src/local/mod.rs | 2 +- core/lib/src/request/form/form.rs | 6 +++--- core/lib/src/request/form/from_form.rs | 4 ++-- core/lib/src/request/form/lenient.rs | 4 ++-- core/lib/src/request/from_request.rs | 6 +++--- core/lib/src/request/param.rs | 6 +++--- core/lib/src/request/state.rs | 2 +- core/lib/src/response/flash.rs | 2 +- core/lib/src/response/responder.rs | 2 +- core/lib/src/rocket.rs | 12 ++++++------ core/lib/tests/absolute-uris-okay-issue-443.rs | 2 +- .../lib/tests/fairing_before_head_strip-issue-546.rs | 2 +- core/lib/tests/flash-lazy-removes-issue-466.rs | 2 +- core/lib/tests/form_method-issue-45.rs | 2 +- core/lib/tests/form_value_decoding-issue-82.rs | 2 +- core/lib/tests/head_handling.rs | 2 +- core/lib/tests/limits.rs | 2 +- .../tests/local-request-content-type-issue-505.rs | 2 +- .../tests/local_request_private_cookie-issue-368.rs | 2 +- core/lib/tests/nested-fairing-attaches.rs | 2 +- core/lib/tests/precise-content-type-matching.rs | 2 +- core/lib/tests/redirect_from_catcher-issue-113.rs | 2 +- core/lib/tests/responder_lifetime-issue-345.rs | 2 +- core/lib/tests/route_guard.rs | 2 +- core/lib/tests/segments-issues-41-86.rs | 2 +- core/lib/tests/strict_and_lenient_forms.rs | 2 +- examples/config/tests/development.rs | 2 +- examples/config/tests/production.rs | 2 +- examples/config/tests/staging.rs | 2 +- examples/content_types/src/main.rs | 2 +- examples/cookies/src/main.rs | 2 +- examples/errors/src/main.rs | 2 +- examples/fairings/src/main.rs | 2 +- examples/form_kitchen_sink/src/main.rs | 2 +- examples/form_validation/src/main.rs | 2 +- examples/handlebars_templates/src/main.rs | 2 +- examples/hello_2018/src/main.rs | 2 +- examples/hello_person/src/main.rs | 2 +- examples/hello_world/src/main.rs | 2 +- examples/json/src/main.rs | 2 +- examples/managed_queue/src/main.rs | 2 +- examples/msgpack/src/main.rs | 2 +- examples/optional_redirect/src/main.rs | 2 +- examples/pastebin/src/main.rs | 2 +- examples/query_params/src/main.rs | 2 +- examples/ranking/src/main.rs | 2 +- examples/raw_sqlite/src/main.rs | 2 +- examples/raw_upload/src/main.rs | 2 +- examples/redirect/src/main.rs | 2 +- examples/request_guard/src/main.rs | 2 +- examples/request_local_state/src/main.rs | 2 +- examples/session/src/main.rs | 2 +- examples/state/src/main.rs | 2 +- examples/stream/src/main.rs | 2 +- examples/tera_templates/src/main.rs | 2 +- examples/testing/src/main.rs | 2 +- examples/tls/src/main.rs | 2 +- examples/todo/src/main.rs | 2 +- examples/uuid/src/main.rs | 2 +- site/guide/getting-started.md | 2 +- site/guide/overview.md | 2 +- site/guide/pastebin.md | 2 +- site/index.toml | 2 +- 100 files changed, 127 insertions(+), 122 deletions(-) diff --git a/README.md b/README.md index 9f7d2c59..d6373f25 100644 --- a/README.md +++ b/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; diff --git a/contrib/lib/src/databases.rs b/contrib/lib/src/databases.rs index 351b8294..cb08e519 100644 --- a/contrib/lib/src/databases.rs +++ b/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; diff --git a/contrib/lib/src/msgpack.rs b/contrib/lib/src/msgpack.rs index 3f2ae7be..d873eb9c 100644 --- a/contrib/lib/src/msgpack.rs +++ b/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; diff --git a/contrib/lib/src/templates/metadata.rs b/contrib/lib/src/templates/metadata.rs index 41ac096d..ecf6f4fa 100644 --- a/contrib/lib/src/templates/metadata.rs +++ b/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() { } diff --git a/contrib/lib/tests/static_files.rs b/contrib/lib/tests/static_files.rs index cc0fc645..6ecaa7d5 100644 --- a/contrib/lib/tests/static_files.rs +++ b/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; diff --git a/contrib/lib/tests/templates.rs b/contrib/lib/tests/templates.rs index df701a9c..e946df47 100644 --- a/contrib/lib/tests/templates.rs +++ b/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; diff --git a/core/codegen_next/Cargo.toml b/core/codegen_next/Cargo.toml index 6cce3b5f..e352f30b 100644 --- a/core/codegen_next/Cargo.toml +++ b/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" diff --git a/core/codegen_next/tests/other-route.rs b/core/codegen_next/tests/other-route.rs index d180768e..e66acf3d 100644 --- a/core/codegen_next/tests/other-route.rs +++ b/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; diff --git a/core/codegen_next/tests/responder.rs b/core/codegen_next/tests/responder.rs index d2c2defc..de0025d5 100644 --- a/core/codegen_next/tests/responder.rs +++ b/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; diff --git a/core/codegen_next/tests/route-data.rs b/core/codegen_next/tests/route-data.rs index 9cc6bd7e..640e0ada 100644 --- a/core/codegen_next/tests/route-data.rs +++ b/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; diff --git a/core/codegen_next/tests/route-format.rs b/core/codegen_next/tests/route-format.rs index 2971f5d9..51d46aba 100644 --- a/core/codegen_next/tests/route-format.rs +++ b/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; diff --git a/core/codegen_next/tests/route-ranking.rs b/core/codegen_next/tests/route-ranking.rs index 8206e36e..a0c1ee87 100644 --- a/core/codegen_next/tests/route-ranking.rs +++ b/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; diff --git a/core/codegen_next/tests/route.rs b/core/codegen_next/tests/route.rs index 24c32251..0a2c038a 100644 --- a/core/codegen_next/tests/route.rs +++ b/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; diff --git a/core/codegen_next/tests/typed-uris.rs b/core/codegen_next/tests/typed-uris.rs index 456048ed..adcffe79 100644 --- a/core/codegen_next/tests/typed-uris.rs +++ b/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; diff --git a/core/codegen_next/tests/ui-fail/catchers.rs b/core/codegen_next/tests/ui-fail/catchers.rs index 59afd814..627bf0c2 100644 --- a/core/codegen_next/tests/ui-fail/catchers.rs +++ b/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; diff --git a/core/codegen_next/tests/ui-fail/route-attribute-general-syntax.rs b/core/codegen_next/tests/ui-fail/route-attribute-general-syntax.rs index 9d5281b6..0074115f 100644 --- a/core/codegen_next/tests/ui-fail/route-attribute-general-syntax.rs +++ b/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; diff --git a/core/codegen_next/tests/ui-fail/route-path-bad-syntax.rs b/core/codegen_next/tests/ui-fail/route-path-bad-syntax.rs index 64d3bb87..03e82968 100644 --- a/core/codegen_next/tests/ui-fail/route-path-bad-syntax.rs +++ b/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; diff --git a/core/codegen_next/tests/ui-fail/route-type-errors.rs b/core/codegen_next/tests/ui-fail/route-type-errors.rs index f62d66a2..c51d9b28 100644 --- a/core/codegen_next/tests/ui-fail/route-type-errors.rs +++ b/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; diff --git a/core/codegen_next/tests/ui-fail/route-warnings.rs b/core/codegen_next/tests/ui-fail/route-warnings.rs index de000f1f..0a147416 100644 --- a/core/codegen_next/tests/ui-fail/route-warnings.rs +++ b/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; diff --git a/core/codegen_next/tests/ui-fail/routes.rs b/core/codegen_next/tests/ui-fail/routes.rs index 2da131a0..954293a5 100644 --- a/core/codegen_next/tests/ui-fail/routes.rs +++ b/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; diff --git a/core/codegen_next/tests/ui-fail/typed-uri-bad-type.rs b/core/codegen_next/tests/ui-fail/typed-uri-bad-type.rs index 0d1b5a56..3429fa66 100644 --- a/core/codegen_next/tests/ui-fail/typed-uri-bad-type.rs +++ b/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; diff --git a/core/codegen_next/tests/ui-fail/typed-uris-bad-params.rs b/core/codegen_next/tests/ui-fail/typed-uris-bad-params.rs index 9a7a6792..30a82268 100644 --- a/core/codegen_next/tests/ui-fail/typed-uris-bad-params.rs +++ b/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; diff --git a/core/codegen_next/tests/ui-fail/typed-uris-invalid-syntax.rs b/core/codegen_next/tests/ui-fail/typed-uris-invalid-syntax.rs index 807b536a..8ab647d0 100644 --- a/core/codegen_next/tests/ui-fail/typed-uris-invalid-syntax.rs +++ b/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; diff --git a/core/http/Cargo.toml b/core/http/Cargo.toml index bf90eff5..75f5e966 100644 --- a/core/http/Cargo.toml +++ b/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] diff --git a/core/http/src/cookies.rs b/core/http/src/cookies.rs index 37c11039..32e6e552 100644 --- a/core/http/src/cookies.rs +++ b/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; diff --git a/core/http/src/lib.rs b/core/http/src/lib.rs index 67a749e9..7fa68cd7 100644 --- a/core/http/src/lib.rs +++ b/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"] diff --git a/core/http/src/uri/uri_display.rs b/core/http/src/uri/uri_display.rs index 69a87a74..0cdac615 100644 --- a/core/http/src/uri/uri_display.rs +++ b/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; diff --git a/core/lib/Cargo.toml b/core/lib/Cargo.toml index 2836520e..d9d59e83 100644 --- a/core/lib/Cargo.toml +++ b/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] diff --git a/core/lib/benches/format-routing.rs b/core/lib/benches/format-routing.rs index 7dd1fd64..ecf09394 100644 --- a/core/lib/benches/format-routing.rs +++ b/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; diff --git a/core/lib/benches/ranked-routing.rs b/core/lib/benches/ranked-routing.rs index 744eb266..8b026bad 100644 --- a/core/lib/benches/ranked-routing.rs +++ b/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; diff --git a/core/lib/benches/simple-routing.rs b/core/lib/benches/simple-routing.rs index 1641495d..7fea9b78 100644 --- a/core/lib/benches/simple-routing.rs +++ b/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; diff --git a/core/lib/build.rs b/core/lib/build.rs index 68fb4db0..a97750b5 100644 --- a/core/lib/build.rs +++ b/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(); diff --git a/core/lib/src/catcher.rs b/core/lib/src/catcher.rs index bb2e82cb..e2bd0b66 100644 --- a/core/lib/src/catcher.rs +++ b/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; /// diff --git a/core/lib/src/data/data.rs b/core/lib/src/data/data.rs index 561be515..a9c7075c 100644 --- a/core/lib/src/data/data.rs +++ b/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 = "")] diff --git a/core/lib/src/data/from_data.rs b/core/lib/src/data/from_data.rs index 6998b554..b94481da 100644 --- a/core/lib/src/data/from_data.rs +++ b/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 = "")] @@ -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 = "")] @@ -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)] diff --git a/core/lib/src/handler.rs b/core/lib/src/handler.rs index a40e5421..2dae01c4 100644 --- a/core/lib/src/handler.rs +++ b/core/lib/src/handler.rs @@ -86,7 +86,7 @@ pub type Outcome<'r> = outcome::Outcome, 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)] diff --git a/core/lib/src/lib.rs b/core/lib/src/lib.rs index 863a71a3..f5b1f8eb 100644 --- a/core/lib/src/lib.rs +++ b/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; //! diff --git a/core/lib/src/local/mod.rs b/core/lib/src/local/mod.rs index d723e140..6b525784 100644 --- a/core/lib/src/local/mod.rs +++ b/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; //! diff --git a/core/lib/src/request/form/form.rs b/core/lib/src/request/form/form.rs index 5d9e8126..5c4c7ef1 100644 --- a/core/lib/src/request/form/form.rs +++ b/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`: /// /// ```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 Form { /// # 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; /// diff --git a/core/lib/src/request/form/from_form.rs b/core/lib/src/request/form/from_form.rs index 2162e25e..f3955366 100644 --- a/core/lib/src/request/form/from_form.rs +++ b/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; diff --git a/core/lib/src/request/form/lenient.rs b/core/lib/src/request/form/lenient.rs index f6f5c5e7..740746d5 100644 --- a/core/lib/src/request/form/lenient.rs +++ b/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 LenientForm { /// # 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; /// diff --git a/core/lib/src/request/from_request.rs b/core/lib/src/request/from_request.rs index c058965f..b648efba 100644 --- a/core/lib/src/request/from_request.rs +++ b/core/lib/src/request/from_request.rs @@ -166,7 +166,7 @@ impl IntoOutcome for Result { /// `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 IntoOutcome for Result { /// 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 IntoOutcome for Result { /// 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; /// # diff --git a/core/lib/src/request/param.rs b/core/lib/src/request/param.rs index be3f68e5..18239bf8 100644 --- a/core/lib/src/request/param.rs +++ b/core/lib/src/request/param.rs @@ -19,7 +19,7 @@ use http::{RawStr, uri::{Segments, SegmentError}}; /// handler for the dynamic `"/"` path: /// /// ```rust -/// # #![feature(proc_macro_non_items, proc_macro_gen, decl_macro)] +/// # #![feature(proc_macro_hygiene, decl_macro)] /// # #[macro_use] extern crate rocket; /// #[get("/")] /// 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("/")] @@ -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; diff --git a/core/lib/src/request/state.rs b/core/lib/src/request/state.rs index dc297016..4b539052 100644 --- a/core/lib/src/request/state.rs +++ b/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; /// diff --git a/core/lib/src/response/flash.rs b/core/lib/src/response/flash.rs index 97df1213..f970cb6d 100644 --- a/core/lib/src/response/flash.rs +++ b/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; diff --git a/core/lib/src/response/responder.rs b/core/lib/src/response/responder.rs index b8ce6a46..3bd7b4c5 100644 --- a/core/lib/src/response/responder.rs +++ b/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)] diff --git a/core/lib/src/rocket.rs b/core/lib/src/rocket.rs index ec78288b..438374cb 100644 --- a/core/lib/src/rocket.rs +++ b/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; diff --git a/core/lib/tests/absolute-uris-okay-issue-443.rs b/core/lib/tests/absolute-uris-okay-issue-443.rs index a992cbe8..b8ad8692 100644 --- a/core/lib/tests/absolute-uris-okay-issue-443.rs +++ b/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; diff --git a/core/lib/tests/fairing_before_head_strip-issue-546.rs b/core/lib/tests/fairing_before_head_strip-issue-546.rs index 02c267f3..80e9d7e4 100644 --- a/core/lib/tests/fairing_before_head_strip-issue-546.rs +++ b/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; diff --git a/core/lib/tests/flash-lazy-removes-issue-466.rs b/core/lib/tests/flash-lazy-removes-issue-466.rs index 46bbb36e..5e81bf79 100644 --- a/core/lib/tests/flash-lazy-removes-issue-466.rs +++ b/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; diff --git a/core/lib/tests/form_method-issue-45.rs b/core/lib/tests/form_method-issue-45.rs index ad2531a8..4eb5fc97 100644 --- a/core/lib/tests/form_method-issue-45.rs +++ b/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; diff --git a/core/lib/tests/form_value_decoding-issue-82.rs b/core/lib/tests/form_value_decoding-issue-82.rs index 7a15ad43..7758fd76 100644 --- a/core/lib/tests/form_value_decoding-issue-82.rs +++ b/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; diff --git a/core/lib/tests/head_handling.rs b/core/lib/tests/head_handling.rs index 7ff0ee99..00317e96 100644 --- a/core/lib/tests/head_handling.rs +++ b/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; diff --git a/core/lib/tests/limits.rs b/core/lib/tests/limits.rs index 87ec3a6b..7ed00281 100644 --- a/core/lib/tests/limits.rs +++ b/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; diff --git a/core/lib/tests/local-request-content-type-issue-505.rs b/core/lib/tests/local-request-content-type-issue-505.rs index 976f4012..aeab9ed3 100644 --- a/core/lib/tests/local-request-content-type-issue-505.rs +++ b/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; diff --git a/core/lib/tests/local_request_private_cookie-issue-368.rs b/core/lib/tests/local_request_private_cookie-issue-368.rs index 1e33d653..2b762cd0 100644 --- a/core/lib/tests/local_request_private_cookie-issue-368.rs +++ b/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; diff --git a/core/lib/tests/nested-fairing-attaches.rs b/core/lib/tests/nested-fairing-attaches.rs index 66395ccc..a9ece085 100644 --- a/core/lib/tests/nested-fairing-attaches.rs +++ b/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; diff --git a/core/lib/tests/precise-content-type-matching.rs b/core/lib/tests/precise-content-type-matching.rs index 88f74be6..681a5e1d 100644 --- a/core/lib/tests/precise-content-type-matching.rs +++ b/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; diff --git a/core/lib/tests/redirect_from_catcher-issue-113.rs b/core/lib/tests/redirect_from_catcher-issue-113.rs index 48ca9677..67ff7b18 100644 --- a/core/lib/tests/redirect_from_catcher-issue-113.rs +++ b/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; diff --git a/core/lib/tests/responder_lifetime-issue-345.rs b/core/lib/tests/responder_lifetime-issue-345.rs index 7c741642..957c25a8 100644 --- a/core/lib/tests/responder_lifetime-issue-345.rs +++ b/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; diff --git a/core/lib/tests/route_guard.rs b/core/lib/tests/route_guard.rs index 73299d7d..07f8ea71 100644 --- a/core/lib/tests/route_guard.rs +++ b/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; diff --git a/core/lib/tests/segments-issues-41-86.rs b/core/lib/tests/segments-issues-41-86.rs index 8b362427..e47bb41c 100644 --- a/core/lib/tests/segments-issues-41-86.rs +++ b/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; diff --git a/core/lib/tests/strict_and_lenient_forms.rs b/core/lib/tests/strict_and_lenient_forms.rs index 9986c94c..e3c1a3f6 100644 --- a/core/lib/tests/strict_and_lenient_forms.rs +++ b/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; diff --git a/examples/config/tests/development.rs b/examples/config/tests/development.rs index a3b55517..b1d602a6 100644 --- a/examples/config/tests/development.rs +++ b/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; diff --git a/examples/config/tests/production.rs b/examples/config/tests/production.rs index a56fb7dc..5800a86b 100644 --- a/examples/config/tests/production.rs +++ b/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; diff --git a/examples/config/tests/staging.rs b/examples/config/tests/staging.rs index 691f1bdf..24b4366b 100644 --- a/examples/config/tests/staging.rs +++ b/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; diff --git a/examples/content_types/src/main.rs b/examples/content_types/src/main.rs index 12d0a9d3..fe957a71 100644 --- a/examples/content_types/src/main.rs +++ b/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; diff --git a/examples/cookies/src/main.rs b/examples/cookies/src/main.rs index e4a606e3..242387d0 100644 --- a/examples/cookies/src/main.rs +++ b/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; diff --git a/examples/errors/src/main.rs b/examples/errors/src/main.rs index f9fe5565..9693363d 100644 --- a/examples/errors/src/main.rs +++ b/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; diff --git a/examples/fairings/src/main.rs b/examples/fairings/src/main.rs index 681b5cee..0f1c982f 100644 --- a/examples/fairings/src/main.rs +++ b/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; diff --git a/examples/form_kitchen_sink/src/main.rs b/examples/form_kitchen_sink/src/main.rs index 8b700a3d..6c017e34 100644 --- a/examples/form_kitchen_sink/src/main.rs +++ b/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; diff --git a/examples/form_validation/src/main.rs b/examples/form_validation/src/main.rs index 2210ac43..580e8170 100644 --- a/examples/form_validation/src/main.rs +++ b/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; diff --git a/examples/handlebars_templates/src/main.rs b/examples/handlebars_templates/src/main.rs index cb0ec939..04862405 100644 --- a/examples/handlebars_templates/src/main.rs +++ b/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; diff --git a/examples/hello_2018/src/main.rs b/examples/hello_2018/src/main.rs index 8a5d705c..cb9855de 100644 --- a/examples/hello_2018/src/main.rs +++ b/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; diff --git a/examples/hello_person/src/main.rs b/examples/hello_person/src/main.rs index 687d73c1..bb400a75 100644 --- a/examples/hello_person/src/main.rs +++ b/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; diff --git a/examples/hello_world/src/main.rs b/examples/hello_world/src/main.rs index 30f14116..fb370fe2 100644 --- a/examples/hello_world/src/main.rs +++ b/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; diff --git a/examples/json/src/main.rs b/examples/json/src/main.rs index a61dc025..7d21e64f 100644 --- a/examples/json/src/main.rs +++ b/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; diff --git a/examples/managed_queue/src/main.rs b/examples/managed_queue/src/main.rs index d5395fc8..5e2c4300 100644 --- a/examples/managed_queue/src/main.rs +++ b/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; diff --git a/examples/msgpack/src/main.rs b/examples/msgpack/src/main.rs index 7e58db35..a7007ad4 100644 --- a/examples/msgpack/src/main.rs +++ b/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; diff --git a/examples/optional_redirect/src/main.rs b/examples/optional_redirect/src/main.rs index fb204a24..9f1d52b4 100644 --- a/examples/optional_redirect/src/main.rs +++ b/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; diff --git a/examples/pastebin/src/main.rs b/examples/pastebin/src/main.rs index dd02abc0..2aca1fb1 100644 --- a/examples/pastebin/src/main.rs +++ b/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; diff --git a/examples/query_params/src/main.rs b/examples/query_params/src/main.rs index 651f08e8..bd97110c 100644 --- a/examples/query_params/src/main.rs +++ b/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; diff --git a/examples/ranking/src/main.rs b/examples/ranking/src/main.rs index 344352c7..89235de1 100644 --- a/examples/ranking/src/main.rs +++ b/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; diff --git a/examples/raw_sqlite/src/main.rs b/examples/raw_sqlite/src/main.rs index 657be047..d959a59c 100644 --- a/examples/raw_sqlite/src/main.rs +++ b/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; diff --git a/examples/raw_upload/src/main.rs b/examples/raw_upload/src/main.rs index 5459c2d3..0808810b 100644 --- a/examples/raw_upload/src/main.rs +++ b/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; diff --git a/examples/redirect/src/main.rs b/examples/redirect/src/main.rs index bb2083fe..16c7ea2b 100644 --- a/examples/redirect/src/main.rs +++ b/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; diff --git a/examples/request_guard/src/main.rs b/examples/request_guard/src/main.rs index 2e92a405..fe84ce20 100644 --- a/examples/request_guard/src/main.rs +++ b/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; diff --git a/examples/request_local_state/src/main.rs b/examples/request_local_state/src/main.rs index 45ea4f49..9aa2db17 100644 --- a/examples/request_local_state/src/main.rs +++ b/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; diff --git a/examples/session/src/main.rs b/examples/session/src/main.rs index a64410bb..5e3a8200 100644 --- a/examples/session/src/main.rs +++ b/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; diff --git a/examples/state/src/main.rs b/examples/state/src/main.rs index 0bd549fd..08556a01 100644 --- a/examples/state/src/main.rs +++ b/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; diff --git a/examples/stream/src/main.rs b/examples/stream/src/main.rs index 377b1e32..3d7b28fa 100644 --- a/examples/stream/src/main.rs +++ b/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; diff --git a/examples/tera_templates/src/main.rs b/examples/tera_templates/src/main.rs index 1e5419aa..f6ae4288 100644 --- a/examples/tera_templates/src/main.rs +++ b/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; diff --git a/examples/testing/src/main.rs b/examples/testing/src/main.rs index 2dae9af1..23a292ff 100644 --- a/examples/testing/src/main.rs +++ b/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; diff --git a/examples/tls/src/main.rs b/examples/tls/src/main.rs index 30f14116..fb370fe2 100644 --- a/examples/tls/src/main.rs +++ b/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; diff --git a/examples/todo/src/main.rs b/examples/todo/src/main.rs index 9868544f..c6252a74 100644 --- a/examples/todo/src/main.rs +++ b/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; diff --git a/examples/uuid/src/main.rs b/examples/uuid/src/main.rs index d8767d30..074a2960 100644 --- a/examples/uuid/src/main.rs +++ b/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; diff --git a/site/guide/getting-started.md b/site/guide/getting-started.md index bfb03b58..81dcd64c 100644 --- a/site/guide/getting-started.md +++ b/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; diff --git a/site/guide/overview.md b/site/guide/overview.md index aa69a771..ff32d4bd 100644 --- a/site/guide/overview.md +++ b/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; diff --git a/site/guide/pastebin.md b/site/guide/pastebin.md index dff3f6cd..cd819af2 100644 --- a/site/guide/pastebin.md +++ b/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; diff --git a/site/index.toml b/site/index.toml index 4f852f7c..163f8927 100644 --- a/site/index.toml +++ b/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;