From 3e4f8453ce4e563e1791a4fe3d5a8eafdfd17a6e Mon Sep 17 00:00:00 2001 From: Jeb Rosen Date: Wed, 19 Jun 2019 23:03:21 -0700 Subject: [PATCH] Remove use of the 'decl_macro' feature. Also removes one internal use in the 'typed-uris' codegen test. --- README.md | 2 +- contrib/lib/src/databases.rs | 8 +++---- contrib/lib/src/json.rs | 8 +++---- contrib/lib/src/msgpack.rs | 4 ++-- contrib/lib/src/templates/metadata.rs | 6 ++--- contrib/lib/src/templates/mod.rs | 4 ++-- contrib/lib/src/uuid.rs | 4 ++-- contrib/lib/tests/compress_responder.rs | 2 +- contrib/lib/tests/compression_fairing.rs | 2 +- contrib/lib/tests/helmet.rs | 2 +- contrib/lib/tests/static_files.rs | 2 +- contrib/lib/tests/templates.rs | 2 +- core/codegen/src/lib.rs | 24 +++++++++---------- core/codegen/tests/expansion.rs | 2 +- core/codegen/tests/responder.rs | 2 +- core/codegen/tests/route-data.rs | 2 +- core/codegen/tests/route-format.rs | 2 +- core/codegen/tests/route-ranking.rs | 2 +- core/codegen/tests/route.rs | 2 +- core/codegen/tests/typed-uris.rs | 14 +++++------ .../ui-fail/route-attribute-general-syntax.rs | 2 +- .../tests/ui-fail/route-path-bad-syntax.rs | 2 +- .../tests/ui-fail/route-type-errors.rs | 2 +- core/codegen/tests/ui-fail/route-warnings.rs | 2 +- .../tests/ui-fail/typed-uri-bad-type.rs | 2 +- .../tests/ui-fail/typed-uris-bad-params.rs | 2 +- .../ui-fail/typed-uris-invalid-syntax.rs | 2 +- core/codegen/tests/uri_display.rs | 2 +- core/http/src/cookies.rs | 4 ++-- core/http/src/uri/from_uri_param.rs | 2 +- core/http/src/uri/uri_display.rs | 8 +++---- core/lib/benches/format-routing.rs | 2 +- core/lib/benches/ranked-routing.rs | 2 +- core/lib/benches/simple-routing.rs | 2 +- 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 | 5 ++-- core/lib/src/local/mod.rs | 2 +- core/lib/src/request/form/error.rs | 2 +- core/lib/src/request/form/form.rs | 6 ++--- core/lib/src/request/form/from_form.rs | 4 ++-- core/lib/src/request/form/from_form_value.rs | 2 +- core/lib/src/request/form/lenient.rs | 4 ++-- core/lib/src/request/from_request.rs | 8 +++---- core/lib/src/request/param.rs | 6 ++--- core/lib/src/request/query.rs | 4 ++-- core/lib/src/request/state.rs | 4 ++-- core/lib/src/response/flash.rs | 2 +- core/lib/src/response/redirect.rs | 2 +- core/lib/src/response/responder.rs | 4 ++-- core/lib/src/rocket.rs | 12 +++++----- .../lib/tests/absolute-uris-okay-issue-443.rs | 2 +- .../conditionally-set-server-header-996.rs | 2 +- core/lib/tests/derive-reexports.rs | 2 +- .../fairing_before_head_strip-issue-546.rs | 2 +- .../lib/tests/flash-lazy-removes-issue-466.rs | 2 +- core/lib/tests/form_method-issue-45.rs | 2 +- .../lib/tests/form_value_decoding-issue-82.rs | 2 +- core/lib/tests/head_handling.rs | 2 +- core/lib/tests/limits.rs | 2 +- .../local-request-content-type-issue-505.rs | 2 +- .../local_request_private_cookie-issue-368.rs | 2 +- core/lib/tests/nested-fairing-attaches.rs | 2 +- .../tests/precise-content-type-matching.rs | 2 +- .../tests/redirect_from_catcher-issue-113.rs | 2 +- .../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 +- .../tests/uri-percent-encoding-issue-808.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_2015/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/10-pastebin.md | 2 +- site/guide/2-getting-started.md | 2 +- site/guide/3-overview.md | 2 +- site/index.toml | 2 +- 109 files changed, 161 insertions(+), 164 deletions(-) diff --git a/README.md b/README.md index 729e0982..873a9406 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/contrib/lib/src/databases.rs b/contrib/lib/src/databases.rs index 771024c2..4afde635 100644 --- a/contrib/lib/src/databases.rs +++ b/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; diff --git a/contrib/lib/src/json.rs b/contrib/lib/src/json.rs index aa114f84..2a1be382 100644 --- a/contrib/lib/src/json.rs +++ b/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 DerefMut for Json { /// 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; diff --git a/contrib/lib/src/msgpack.rs b/contrib/lib/src/msgpack.rs index 77e2842e..354cd1da 100644 --- a/contrib/lib/src/msgpack.rs +++ b/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; diff --git a/contrib/lib/src/templates/metadata.rs b/contrib/lib/src/templates/metadata.rs index 26cf2fea..b60bb673 100644 --- a/contrib/lib/src/templates/metadata.rs +++ b/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; /// # diff --git a/contrib/lib/src/templates/mod.rs b/contrib/lib/src/templates/mod.rs index c3554a20..ddb91798 100644 --- a/contrib/lib/src/templates/mod.rs +++ b/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() { } diff --git a/contrib/lib/src/uuid.rs b/contrib/lib/src/uuid.rs index 24fd756d..5fab5efd 100644 --- a/contrib/lib/src/uuid.rs +++ b/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; diff --git a/contrib/lib/tests/compress_responder.rs b/contrib/lib/tests/compress_responder.rs index ab3c79f0..2d317ddf 100644 --- a/contrib/lib/tests/compress_responder.rs +++ b/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"))] diff --git a/contrib/lib/tests/compression_fairing.rs b/contrib/lib/tests/compression_fairing.rs index 9f3b13c3..fa09188d 100644 --- a/contrib/lib/tests/compression_fairing.rs +++ b/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"))] diff --git a/contrib/lib/tests/helmet.rs b/contrib/lib/tests/helmet.rs index d6dcbb5f..bd67537b 100644 --- a/contrib/lib/tests/helmet.rs +++ b/contrib/lib/tests/helmet.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] #[cfg(feature = "helmet")] diff --git a/contrib/lib/tests/static_files.rs b/contrib/lib/tests/static_files.rs index 4a01d725..18b4b1f6 100644 --- a/contrib/lib/tests/static_files.rs +++ b/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 { diff --git a/contrib/lib/tests/templates.rs b/contrib/lib/tests/templates.rs index acdc787b..25c62f90 100644 --- a/contrib/lib/tests/templates.rs +++ b/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; diff --git a/core/codegen/src/lib.rs b/core/codegen/src/lib.rs index e7fc207c..87a8f859 100644 --- a/core/codegen/src/lib.rs +++ b/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/?")] @@ -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/?")] diff --git a/core/codegen/tests/expansion.rs b/core/codegen/tests/expansion.rs index 0a85452a..aaaf2fcd 100644 --- a/core/codegen/tests/expansion.rs +++ b/core/codegen/tests/expansion.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/codegen/tests/responder.rs b/core/codegen/tests/responder.rs index 6c7d1d1a..0df09bc6 100644 --- a/core/codegen/tests/responder.rs +++ b/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; diff --git a/core/codegen/tests/route-data.rs b/core/codegen/tests/route-data.rs index 168de24b..e15f4bb5 100644 --- a/core/codegen/tests/route-data.rs +++ b/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; diff --git a/core/codegen/tests/route-format.rs b/core/codegen/tests/route-format.rs index 51d46aba..32bb935c 100644 --- a/core/codegen/tests/route-format.rs +++ b/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; diff --git a/core/codegen/tests/route-ranking.rs b/core/codegen/tests/route-ranking.rs index a0c1ee87..a85ee24c 100644 --- a/core/codegen/tests/route-ranking.rs +++ b/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; diff --git a/core/codegen/tests/route.rs b/core/codegen/tests/route.rs index ecc55466..e752bfa4 100644 --- a/core/codegen/tests/route.rs +++ b/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 diff --git a/core/codegen/tests/typed-uris.rs b/core/codegen/tests/typed-uris.rs index 28fac9a3..7f366e7e 100644 --- a/core/codegen/tests/typed-uris.rs +++ b/core/codegen/tests/typed-uris.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #![allow(dead_code, unused_variables)] #[macro_use] extern crate rocket; @@ -6,7 +6,7 @@ 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//then/")] 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/")] fn simple(id: i32) { } @@ -339,8 +339,6 @@ mod typed_uris { } pub mod deeper { - use super::assert_uri_eq; - #[post("/typed_uris/deeper/")] fn simple(id: i32) { } diff --git a/core/codegen/tests/ui-fail/route-attribute-general-syntax.rs b/core/codegen/tests/ui-fail/route-attribute-general-syntax.rs index 0074115f..8457f96b 100644 --- a/core/codegen/tests/ui-fail/route-attribute-general-syntax.rs +++ b/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; diff --git a/core/codegen/tests/ui-fail/route-path-bad-syntax.rs b/core/codegen/tests/ui-fail/route-path-bad-syntax.rs index fa3a47cf..ab6a8a4a 100644 --- a/core/codegen/tests/ui-fail/route-path-bad-syntax.rs +++ b/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; diff --git a/core/codegen/tests/ui-fail/route-type-errors.rs b/core/codegen/tests/ui-fail/route-type-errors.rs index c51d9b28..f97645ae 100644 --- a/core/codegen/tests/ui-fail/route-type-errors.rs +++ b/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; diff --git a/core/codegen/tests/ui-fail/route-warnings.rs b/core/codegen/tests/ui-fail/route-warnings.rs index 0a147416..9111a216 100644 --- a/core/codegen/tests/ui-fail/route-warnings.rs +++ b/core/codegen/tests/ui-fail/route-warnings.rs @@ -1,6 +1,6 @@ // must-compile-successfully -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/codegen/tests/ui-fail/typed-uri-bad-type.rs b/core/codegen/tests/ui-fail/typed-uri-bad-type.rs index 3267e8d6..05b24fb3 100644 --- a/core/codegen/tests/ui-fail/typed-uri-bad-type.rs +++ b/core/codegen/tests/ui-fail/typed-uri-bad-type.rs @@ -1,7 +1,7 @@ // normalize-stderr-test: "<(.*) as (.*)>" -> "$1 as $$TRAIT" // normalize-stderr-test: "and \d+ others" -> "and $$N others" -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/codegen/tests/ui-fail/typed-uris-bad-params.rs b/core/codegen/tests/ui-fail/typed-uris-bad-params.rs index fb0d86b3..2baf5be9 100644 --- a/core/codegen/tests/ui-fail/typed-uris-bad-params.rs +++ b/core/codegen/tests/ui-fail/typed-uris-bad-params.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/codegen/tests/ui-fail/typed-uris-invalid-syntax.rs b/core/codegen/tests/ui-fail/typed-uris-invalid-syntax.rs index 8ab647d0..0c22cc17 100644 --- a/core/codegen/tests/ui-fail/typed-uris-invalid-syntax.rs +++ b/core/codegen/tests/ui-fail/typed-uris-invalid-syntax.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/codegen/tests/uri_display.rs b/core/codegen/tests/uri_display.rs index fd233ef6..b51d716a 100644 --- a/core/codegen/tests/uri_display.rs +++ b/core/codegen/tests/uri_display.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/http/src/cookies.rs b/core/http/src/cookies.rs index caf7f3ba..c9e82b5d 100644 --- a/core/http/src/cookies.rs +++ b/core/http/src/cookies.rs @@ -54,7 +54,7 @@ mod key { /// a handler to retrieve the value of a "message" cookie. /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::http::Cookies; /// @@ -74,7 +74,7 @@ mod key { /// [private cookie]: Cookies::add_private() /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # /// use rocket::http::Status; diff --git a/core/http/src/uri/from_uri_param.rs b/core/http/src/uri/from_uri_param.rs index 2d1d3d51..4aa374f8 100644 --- a/core/http/src/uri/from_uri_param.rs +++ b/core/http/src/uri/from_uri_param.rs @@ -155,7 +155,7 @@ use crate::uri::{self, UriPart, UriDisplay}; /// With these implementations, the following typechecks: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # use std::fmt; /// use rocket::http::RawStr; diff --git a/core/http/src/uri/uri_display.rs b/core/http/src/uri/uri_display.rs index 408d75e7..153778fb 100644 --- a/core/http/src/uri/uri_display.rs +++ b/core/http/src/uri/uri_display.rs @@ -61,7 +61,7 @@ use crate::uri::{Uri, UriPart, Path, Query, Formatter}; /// the following route: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// #[get("/item/?")] /// fn get_item(id: i32, track: Option) { /* .. */ } @@ -70,7 +70,7 @@ use crate::uri::{Uri, UriPart, Path, Query, Formatter}; /// A URI for this route can be generated as follows: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # type T = (); /// # #[get("/item/?")] @@ -234,7 +234,7 @@ use crate::uri::{Uri, UriPart, Path, Query, Formatter}; /// `UriDisplay` implementation is required. /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::http::RawStr; /// use rocket::request::FromParam; @@ -432,7 +432,7 @@ impl, E> UriDisplay for Result { /// trait for the corresponding `UriPart`. /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// #[get("/item/?")] /// fn get_item(id: i32, track: Option) { /* .. */ } diff --git a/core/lib/benches/format-routing.rs b/core/lib/benches/format-routing.rs index ecf09394..f71eca05 100644 --- a/core/lib/benches/format-routing.rs +++ b/core/lib/benches/format-routing.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/lib/benches/ranked-routing.rs b/core/lib/benches/ranked-routing.rs index 8b026bad..d782ca79 100644 --- a/core/lib/benches/ranked-routing.rs +++ b/core/lib/benches/ranked-routing.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/lib/benches/simple-routing.rs b/core/lib/benches/simple-routing.rs index 7fea9b78..27fef79d 100644 --- a/core/lib/benches/simple-routing.rs +++ b/core/lib/benches/simple-routing.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] // #![feature(alloc_system)] // extern crate alloc_system; diff --git a/core/lib/src/catcher.rs b/core/lib/src/catcher.rs index 76ccf760..91c5b550 100644 --- a/core/lib/src/catcher.rs +++ b/core/lib/src/catcher.rs @@ -34,7 +34,7 @@ use yansi::Color::*; /// declared using the `catch` decorator, as follows: /// /// ```rust -/// #![feature(proc_macro_hygiene, decl_macro)] +/// #![feature(proc_macro_hygiene)] /// /// #[macro_use] extern crate rocket; /// diff --git a/core/lib/src/data/data.rs b/core/lib/src/data/data.rs index e33c7624..83fcbfc2 100644 --- a/core/lib/src/data/data.rs +++ b/core/lib/src/data/data.rs @@ -31,7 +31,7 @@ const PEEK_BYTES: usize = 512; /// specifying the `data = ""` route parameter as follows: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[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 03d63576..3aa5779b 100644 --- a/core/lib/src/data/from_data.rs +++ b/core/lib/src/data/from_data.rs @@ -135,7 +135,7 @@ pub type Transformed<'a, T> = /// if the guard returns successfully. /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # type DataGuard = rocket::data::Data; /// #[post("/submit", data = "")] @@ -181,7 +181,7 @@ pub type Transformed<'a, T> = /// `String` (an `&str`). /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # #[derive(Debug)] /// # struct Name<'a> { first: &'a str, last: &'a str, } @@ -427,7 +427,7 @@ impl<'f> FromData<'f> for Data { /// that you can retrieve it directly from a client's request body: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # type Person = rocket::data::Data; /// #[post("/person", data = "")] @@ -439,7 +439,7 @@ impl<'f> FromData<'f> for Data { /// A `FromDataSimple` implementation allowing this looks like: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # /// # #[derive(Debug)] diff --git a/core/lib/src/handler.rs b/core/lib/src/handler.rs index d9facc69..dcd71a80 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_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # /// # #[derive(Copy, Clone)] diff --git a/core/lib/src/lib.rs b/core/lib/src/lib.rs index 7e1afa7a..a96221bc 100644 --- a/core/lib/src/lib.rs +++ b/core/lib/src/lib.rs @@ -1,5 +1,4 @@ #![feature(specialization)] -#![feature(decl_macro)] #![feature(try_trait)] #![feature(proc_macro_hygiene)] #![feature(crate_visibility_modifier)] @@ -52,7 +51,7 @@ //! Then, add the following to the top of your `main.rs` file: //! //! ```rust -//! #![feature(proc_macro_hygiene, decl_macro)] +//! #![feature(proc_macro_hygiene)] //! //! #[macro_use] extern crate rocket; //! # #[get("/")] fn hello() { } @@ -63,7 +62,7 @@ //! write Rocket applications. Here's a simple example to get you started: //! //! ```rust -//! #![feature(proc_macro_hygiene, decl_macro)] +//! #![feature(proc_macro_hygiene)] //! //! #[macro_use] extern crate rocket; //! diff --git a/core/lib/src/local/mod.rs b/core/lib/src/local/mod.rs index e02c9526..6265718a 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_hygiene, decl_macro)] +//! #![feature(proc_macro_hygiene)] //! //! #[macro_use] extern crate rocket; //! diff --git a/core/lib/src/request/form/error.rs b/core/lib/src/request/form/error.rs index eb683db5..086be805 100644 --- a/core/lib/src/request/form/error.rs +++ b/core/lib/src/request/form/error.rs @@ -50,7 +50,7 @@ pub enum FormDataError<'f, E> { /// # Example /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::request::{Form, FormError, FormDataError}; /// diff --git a/core/lib/src/request/form/form.rs b/core/lib/src/request/form/form.rs index 6ac95786..d3f56ed4 100644 --- a/core/lib/src/request/form/form.rs +++ b/core/lib/src/request/form/form.rs @@ -30,7 +30,7 @@ use crate::http::{Status, uri::{Query, FromUriParam}}; /// implements the `FromForm` trait: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::request::Form; /// use rocket::http::RawStr; @@ -66,7 +66,7 @@ use crate::http::{Status, uri::{Query, FromUriParam}}; /// A handler that handles a form of this type can similarly by written: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #![allow(deprecated, unused_attributes)] /// # #[macro_use] extern crate rocket; /// # use rocket::request::Form; @@ -119,7 +119,7 @@ impl Form { /// # Example /// /// ```rust - /// # #![feature(proc_macro_hygiene, decl_macro)] + /// # #![feature(proc_macro_hygiene)] /// # #[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 45b5d788..dc590430 100644 --- a/core/lib/src/request/form/from_form.rs +++ b/core/lib/src/request/form/from_form.rs @@ -13,7 +13,7 @@ use crate::request::FormItems; /// validation. /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #![allow(deprecated, dead_code, unused_attributes)] /// # #[macro_use] extern crate rocket; /// #[derive(FromForm)] @@ -30,7 +30,7 @@ use crate::request::FormItems; /// data via the `data` parameter and `Form` type. /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #![allow(deprecated, dead_code, unused_attributes)] /// # #[macro_use] extern crate rocket; /// # use rocket::request::Form; diff --git a/core/lib/src/request/form/from_form_value.rs b/core/lib/src/request/form/from_form_value.rs index 534f00c3..477639d2 100644 --- a/core/lib/src/request/form/from_form_value.rs +++ b/core/lib/src/request/form/from_form_value.rs @@ -43,7 +43,7 @@ use crate::http::RawStr; /// according to its target type: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # type Size = String; /// #[get("/item?&")] diff --git a/core/lib/src/request/form/lenient.rs b/core/lib/src/request/form/lenient.rs index 4cae348f..e7756ec4 100644 --- a/core/lib/src/request/form/lenient.rs +++ b/core/lib/src/request/form/lenient.rs @@ -31,7 +31,7 @@ use crate::http::uri::{Query, FromUriParam}; /// handler: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::request::LenientForm; /// @@ -67,7 +67,7 @@ impl LenientForm { /// # Example /// /// ```rust - /// # #![feature(proc_macro_hygiene, decl_macro)] + /// # #![feature(proc_macro_hygiene)] /// # #[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 9202f838..dfcfe7ca 100644 --- a/core/lib/src/request/from_request.rs +++ b/core/lib/src/request/from_request.rs @@ -55,7 +55,7 @@ impl IntoOutcome for Result { /// guard. /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # use rocket::http::Method; /// # type A = Method; type B = Method; type C = Method; type T = (); @@ -165,7 +165,7 @@ impl IntoOutcome for Result { /// `sensitive` handler. /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # /// use rocket::Outcome; @@ -220,7 +220,7 @@ impl IntoOutcome for Result { /// routes (`admin_dashboard` and `user_dashboard`): /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # #[cfg(feature = "private-cookies")] mod inner { /// # use rocket::outcome::{IntoOutcome, Outcome}; @@ -283,7 +283,7 @@ impl IntoOutcome for Result { /// used, as illustrated below: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # #[cfg(feature = "private-cookies")] mod inner { /// # use rocket::outcome::{IntoOutcome, Outcome}; diff --git a/core/lib/src/request/param.rs b/core/lib/src/request/param.rs index 9a1643b4..bcbdd9a5 100644 --- a/core/lib/src/request/param.rs +++ b/core/lib/src/request/param.rs @@ -19,7 +19,7 @@ use crate::http::{RawStr, uri::{Segments, SegmentError}}; /// handler for the dynamic `"/"` path: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// #[get("/")] /// fn hello(id: usize) -> String { @@ -54,7 +54,7 @@ use crate::http::{RawStr, uri::{Segments, SegmentError}}; /// parameter as follows: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # use rocket::http::RawStr; /// #[get("/")] @@ -172,7 +172,7 @@ use crate::http::{RawStr, uri::{Segments, SegmentError}}; /// dynamic path segment: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # use rocket::request::FromParam; /// # use rocket::http::RawStr; diff --git a/core/lib/src/request/query.rs b/core/lib/src/request/query.rs index 3fc4191b..d6a4d55b 100644 --- a/core/lib/src/request/query.rs +++ b/core/lib/src/request/query.rs @@ -8,7 +8,7 @@ use crate::request::{FormItems, FormItem, Form, LenientForm, FromForm}; /// generation for every trailing query parameter, `` below: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # /// # use rocket::request::Form; @@ -82,7 +82,7 @@ impl<'q> Iterator for Query<'q> { /// route: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::request::Form; /// diff --git a/core/lib/src/request/state.rs b/core/lib/src/request/state.rs index fdaef191..54370a3d 100644 --- a/core/lib/src/request/state.rs +++ b/core/lib/src/request/state.rs @@ -22,7 +22,7 @@ use crate::http::Status; /// following example does just this: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::State; /// @@ -87,7 +87,7 @@ use crate::http::Status; /// [`State::from()`] static method: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[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 8bbc4c39..b7c2db54 100644 --- a/core/lib/src/response/flash.rs +++ b/core/lib/src/response/flash.rs @@ -45,7 +45,7 @@ const FLASH_COOKIE_NAME: &str = "_flash"; /// message on both the request and response sides. /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::response::{Flash, Redirect}; /// use rocket::request::FlashMessage; diff --git a/core/lib/src/response/redirect.rs b/core/lib/src/response/redirect.rs index 4fe245f7..66fde42c 100644 --- a/core/lib/src/response/redirect.rs +++ b/core/lib/src/response/redirect.rs @@ -26,7 +26,7 @@ use crate::http::Status; /// a route, _always_ use [`uri!`] to construct a valid [`Origin`]: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::response::Redirect; /// diff --git a/core/lib/src/response/responder.rs b/core/lib/src/response/responder.rs index f0a83a2f..8a541dbc 100644 --- a/core/lib/src/response/responder.rs +++ b/core/lib/src/response/responder.rs @@ -12,7 +12,7 @@ use crate::request::Request; /// as illustrated below with `T`: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # type T = (); /// # @@ -153,7 +153,7 @@ use crate::request::Request; /// following `Responder` implementation accomplishes this: /// /// ```rust -/// # #![feature(proc_macro_hygiene, decl_macro)] +/// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # /// # #[derive(Debug)] diff --git a/core/lib/src/rocket.rs b/core/lib/src/rocket.rs index a423ec51..c8fe76ef 100644 --- a/core/lib/src/rocket.rs +++ b/core/lib/src/rocket.rs @@ -457,7 +457,7 @@ impl Rocket { /// dispatched to the `hi` route. /// /// ```rust - /// # #![feature(proc_macro_hygiene, decl_macro)] + /// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// # /// #[get("/world")] @@ -529,7 +529,7 @@ impl Rocket { /// # Examples /// /// ```rust - /// # #![feature(proc_macro_hygiene, decl_macro)] + /// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::Request; /// @@ -584,7 +584,7 @@ impl Rocket { /// # Example /// /// ```rust - /// # #![feature(proc_macro_hygiene, decl_macro)] + /// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::State; /// @@ -621,7 +621,7 @@ impl Rocket { /// # Example /// /// ```rust - /// # #![feature(proc_macro_hygiene, decl_macro)] + /// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::Rocket; /// use rocket::fairing::AdHoc; @@ -735,7 +735,7 @@ impl Rocket { /// # Example /// /// ```rust - /// # #![feature(proc_macro_hygiene, decl_macro)] + /// # #![feature(proc_macro_hygiene)] /// # #[macro_use] extern crate rocket; /// use rocket::Rocket; /// use rocket::fairing::AdHoc; @@ -791,7 +791,7 @@ impl Rocket { /// # Example /// /// ```rust - /// # #![feature(proc_macro_hygiene, decl_macro)] + /// # #![feature(proc_macro_hygiene)] /// # #[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 b8ad8692..758d1d72 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/lib/tests/conditionally-set-server-header-996.rs b/core/lib/tests/conditionally-set-server-header-996.rs index 4c18ab67..f20f18a1 100644 --- a/core/lib/tests/conditionally-set-server-header-996.rs +++ b/core/lib/tests/conditionally-set-server-header-996.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/lib/tests/derive-reexports.rs b/core/lib/tests/derive-reexports.rs index e47430c6..3d3ac70e 100644 --- a/core/lib/tests/derive-reexports.rs +++ b/core/lib/tests/derive-reexports.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] use 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 80e9d7e4..546e7a78 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 a7ec90ca..584c97db 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 4eb5fc97..5acaff82 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 7758fd76..2780eeed 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/lib/tests/head_handling.rs b/core/lib/tests/head_handling.rs index aa882eb9..5e3dd96d 100644 --- a/core/lib/tests/head_handling.rs +++ b/core/lib/tests/head_handling.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/lib/tests/limits.rs b/core/lib/tests/limits.rs index 7ed00281..9e23abb1 100644 --- a/core/lib/tests/limits.rs +++ b/core/lib/tests/limits.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 aeab9ed3..4803e929 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 ef6c8613..deba440e 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] #[cfg(feature = "private-cookies")] diff --git a/core/lib/tests/nested-fairing-attaches.rs b/core/lib/tests/nested-fairing-attaches.rs index d0db32d0..19137f4f 100644 --- a/core/lib/tests/nested-fairing-attaches.rs +++ b/core/lib/tests/nested-fairing-attaches.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 681a5e1d..da7349c6 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 67ff7b18..f50f2ba3 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 957c25a8..b35cddde 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #![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 14f5d2b3..64bfe8f7 100644 --- a/core/lib/tests/route_guard.rs +++ b/core/lib/tests/route_guard.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 3ad8dae2..f9bd50a8 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 e3c1a3f6..4ba5300d 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_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/core/lib/tests/uri-percent-encoding-issue-808.rs b/core/lib/tests/uri-percent-encoding-issue-808.rs index 14f19def..b46cc892 100644 --- a/core/lib/tests/uri-percent-encoding-issue-808.rs +++ b/core/lib/tests/uri-percent-encoding-issue-808.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/config/tests/development.rs b/examples/config/tests/development.rs index b1d602a6..1b5753bc 100644 --- a/examples/config/tests/development.rs +++ b/examples/config/tests/development.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/config/tests/production.rs b/examples/config/tests/production.rs index 5800a86b..7208a7a4 100644 --- a/examples/config/tests/production.rs +++ b/examples/config/tests/production.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/config/tests/staging.rs b/examples/config/tests/staging.rs index 24b4366b..fc88fee8 100644 --- a/examples/config/tests/staging.rs +++ b/examples/config/tests/staging.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/content_types/src/main.rs b/examples/content_types/src/main.rs index d62ce5d7..ac1d379e 100644 --- a/examples/content_types/src/main.rs +++ b/examples/content_types/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 3c4871f7..1232def3 100644 --- a/examples/cookies/src/main.rs +++ b/examples/cookies/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/errors/src/main.rs b/examples/errors/src/main.rs index 1004d397..3aa27066 100644 --- a/examples/errors/src/main.rs +++ b/examples/errors/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/fairings/src/main.rs b/examples/fairings/src/main.rs index cd823e21..d1a9e44c 100644 --- a/examples/fairings/src/main.rs +++ b/examples/fairings/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/form_kitchen_sink/src/main.rs b/examples/form_kitchen_sink/src/main.rs index f3330af7..9b841c30 100644 --- a/examples/form_kitchen_sink/src/main.rs +++ b/examples/form_kitchen_sink/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/form_validation/src/main.rs b/examples/form_validation/src/main.rs index e389004a..0495409b 100644 --- a/examples/form_validation/src/main.rs +++ b/examples/form_validation/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/handlebars_templates/src/main.rs b/examples/handlebars_templates/src/main.rs index 5dcac211..829940f9 100644 --- a/examples/handlebars_templates/src/main.rs +++ b/examples/handlebars_templates/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; #[macro_use] extern crate serde_derive; diff --git a/examples/hello_2015/src/main.rs b/examples/hello_2015/src/main.rs index 0085e155..1001fb52 100644 --- a/examples/hello_2015/src/main.rs +++ b/examples/hello_2015/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/hello_person/src/main.rs b/examples/hello_person/src/main.rs index bb400a75..96c4ae2e 100644 --- a/examples/hello_person/src/main.rs +++ b/examples/hello_person/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/hello_world/src/main.rs b/examples/hello_world/src/main.rs index fb370fe2..6c1111f4 100644 --- a/examples/hello_world/src/main.rs +++ b/examples/hello_world/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/json/src/main.rs b/examples/json/src/main.rs index d2823dae..65698c94 100644 --- a/examples/json/src/main.rs +++ b/examples/json/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 22ed3db1..d0588bc6 100644 --- a/examples/managed_queue/src/main.rs +++ b/examples/managed_queue/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/msgpack/src/main.rs b/examples/msgpack/src/main.rs index 2e514629..2af8c51d 100644 --- a/examples/msgpack/src/main.rs +++ b/examples/msgpack/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 9f1d52b4..8c81c24a 100644 --- a/examples/optional_redirect/src/main.rs +++ b/examples/optional_redirect/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/pastebin/src/main.rs b/examples/pastebin/src/main.rs index 1dddd417..bc0d2319 100644 --- a/examples/pastebin/src/main.rs +++ b/examples/pastebin/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/query_params/src/main.rs b/examples/query_params/src/main.rs index bd97110c..518902ce 100644 --- a/examples/query_params/src/main.rs +++ b/examples/query_params/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/ranking/src/main.rs b/examples/ranking/src/main.rs index 89235de1..2267fc3d 100644 --- a/examples/ranking/src/main.rs +++ b/examples/ranking/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/raw_sqlite/src/main.rs b/examples/raw_sqlite/src/main.rs index ac241ee8..37e582cc 100644 --- a/examples/raw_sqlite/src/main.rs +++ b/examples/raw_sqlite/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/raw_upload/src/main.rs b/examples/raw_upload/src/main.rs index 1980973b..15bc96d7 100644 --- a/examples/raw_upload/src/main.rs +++ b/examples/raw_upload/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/redirect/src/main.rs b/examples/redirect/src/main.rs index 16c7ea2b..cfd7db27 100644 --- a/examples/redirect/src/main.rs +++ b/examples/redirect/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/request_guard/src/main.rs b/examples/request_guard/src/main.rs index 0008fbba..48efc937 100644 --- a/examples/request_guard/src/main.rs +++ b/examples/request_guard/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/request_local_state/src/main.rs b/examples/request_local_state/src/main.rs index f4063211..8bfe071e 100644 --- a/examples/request_local_state/src/main.rs +++ b/examples/request_local_state/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/session/src/main.rs b/examples/session/src/main.rs index 6ac2e987..d874495c 100644 --- a/examples/session/src/main.rs +++ b/examples/session/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/state/src/main.rs b/examples/state/src/main.rs index 7cc54e6d..9bd48352 100644 --- a/examples/state/src/main.rs +++ b/examples/state/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/stream/src/main.rs b/examples/stream/src/main.rs index 3d7b28fa..d7a1b886 100644 --- a/examples/stream/src/main.rs +++ b/examples/stream/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/tera_templates/src/main.rs b/examples/tera_templates/src/main.rs index 2b04cd70..83c53122 100644 --- a/examples/tera_templates/src/main.rs +++ b/examples/tera_templates/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 23a292ff..647d76b7 100644 --- a/examples/testing/src/main.rs +++ b/examples/testing/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/tls/src/main.rs b/examples/tls/src/main.rs index fb370fe2..6c1111f4 100644 --- a/examples/tls/src/main.rs +++ b/examples/tls/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/examples/todo/src/main.rs b/examples/todo/src/main.rs index d3ed0f1f..8e17a21d 100644 --- a/examples/todo/src/main.rs +++ b/examples/todo/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[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 df9fe13c..38639da9 100644 --- a/examples/uuid/src/main.rs +++ b/examples/uuid/src/main.rs @@ -1,4 +1,4 @@ -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; #[macro_use] extern crate lazy_static; diff --git a/site/guide/10-pastebin.md b/site/guide/10-pastebin.md index 2972df34..bcfe46ee 100644 --- a/site/guide/10-pastebin.md +++ b/site/guide/10-pastebin.md @@ -50,7 +50,7 @@ And finally, create a skeleton Rocket application to work off of in `src/main.rs`: ```rust -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/site/guide/2-getting-started.md b/site/guide/2-getting-started.md index 9dcef447..730555dc 100644 --- a/site/guide/2-getting-started.md +++ b/site/guide/2-getting-started.md @@ -57,7 +57,7 @@ Modify `src/main.rs` so that it contains the code for the Rocket `Hello, world!` program, reproduced below: ```rust -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/site/guide/3-overview.md b/site/guide/3-overview.md index 4a72a976..1dedfcb1 100644 --- a/site/guide/3-overview.md +++ b/site/guide/3-overview.md @@ -141,7 +141,7 @@ We typically call `launch` from the `main` function. Our complete _Hello, world!_ application thus looks like: ```rust -#![feature(proc_macro_hygiene, decl_macro)] +#![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket; diff --git a/site/index.toml b/site/index.toml index 3592f5d3..13efdc23 100644 --- a/site/index.toml +++ b/site/index.toml @@ -47,7 +47,7 @@ margin = 9 [[sections]] title = "Hello, Rocket!" code = ''' - #![feature(proc_macro_hygiene, decl_macro)] + #![feature(proc_macro_hygiene)] #[macro_use] extern crate rocket;