Add macro imports and #![feature(proc_macro_non_items)] to examples a…

…nd tests

core/codegen/tests/complete-decorator.rs

@@ -1,9 +1,10 @@
-#![feature(plugin, decl_macro, custom_derive)]
+#![feature(plugin, decl_macro, custom_derive, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 #![allow(dead_code, unused_variables)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::http::{Cookies, RawStr};
 use rocket::request::Form;
 

core/codegen/tests/dynamic-paths.rs

@@ -1,9 +1,11 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 #![allow(dead_code, unused_variables)]
 
 extern crate rocket;
 
+use rocket::routes;
+
 #[get("/test/<one>/<two>/<three>")]
 fn get(one: String, two: usize, three: isize) -> &'static str { "hi" }
 

core/codegen/tests/instanced-mounting.rs

@@ -1,9 +1,11 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 #![allow(dead_code, unused_variables)]
 
 extern crate rocket;
 
+use rocket::routes;
+
 #[get("/one")]
 fn one() { }
 

core/codegen/tests/issue-1-colliding-names.rs

@@ -1,8 +1,10 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
+
 #[get("/<todo>")]
 fn todo(todo: String) -> String {
  todo

core/codegen/tests/refactored_rocket_no_lint_errors.rs

@@ -1,9 +1,10 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 #![allow(dead_code, unused_variables)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::{Rocket, State};
 
 #[get("/")]

core/codegen/tests/type-alias-lints.rs

@@ -1,9 +1,10 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 #![allow(dead_code, unused_variables)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::State;
 
 type MyState<'r> = State<'r, usize>;

core/lib/src/catcher.rs

@@ -35,11 +35,12 @@ use yansi::Color::*;
 /// declared using the `catch` decorator, as follows:
 ///
 /// ```rust
-/// #![feature(plugin, decl_macro)]
+/// #![feature(plugin, decl_macro, proc_macro_non_items)]
 /// #![plugin(rocket_codegen)]
 ///
 /// extern crate rocket;
 ///
+/// use rocket::catchers;
 /// use rocket::Request;
 ///
 /// #[catch(500)]

core/lib/src/lib.rs

@@ -67,10 +67,11 @@
 //! write Rocket applications. Here's a simple example to get you started:
 //!
 //! ```rust
-//! #![feature(plugin, decl_macro)]
+//! #![feature(plugin, decl_macro, proc_macro_non_items)]
 //! #![plugin(rocket_codegen)]
 //!
 //! extern crate rocket;
+//! use rocket::routes;
 //!
 //! #[get("/")]
 //! fn hello() -> &'static str {

core/lib/src/request/state.rs

@@ -21,9 +21,10 @@ use http::Status;
 /// following example does just this:
 ///
 /// ```rust
-/// # #![feature(plugin, decl_macro)]
+/// # #![feature(plugin, decl_macro, proc_macro_non_items)]
 /// # #![plugin(rocket_codegen)]
 /// # extern crate rocket;
+/// # use rocket::routes;
 /// use rocket::State;
 ///
 /// // In a real application, this would likely be more complex.

core/lib/src/response/flash.rs

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

core/lib/src/rocket.rs

@@ -444,9 +444,10 @@ impl Rocket {
  /// dispatched to the `hi` route.
  ///
  /// ```rust
- /// # #![feature(plugin, decl_macro)]
+ /// # #![feature(plugin, decl_macro, proc_macro_non_items)]
  /// # #![plugin(rocket_codegen)]
  /// # extern crate rocket;
+ /// # use rocket::routes;
  /// #
  /// #[get("/world")]
  /// fn hi() -> &'static str {
@@ -510,11 +511,12 @@ impl Rocket {
  /// # Examples
  ///
  /// ```rust
- /// #![feature(plugin, decl_macro)]
+ /// #![feature(plugin, decl_macro, proc_macro_non_items)]
  /// #![plugin(rocket_codegen)]
  ///
  /// extern crate rocket;
  ///
+ /// use rocket::catchers;
  /// use rocket::Request;
  ///
  /// #[catch(500)]
@@ -569,9 +571,10 @@ impl Rocket {
  /// # Example
  ///
  /// ```rust
- /// # #![feature(plugin, decl_macro)]
+ /// # #![feature(plugin, decl_macro, proc_macro_non_items)]
  /// # #![plugin(rocket_codegen)]
  /// # extern crate rocket;
+ /// # use rocket::routes;
  /// use rocket::State;
  ///
  /// struct MyValue(usize);
@@ -720,9 +723,10 @@ impl Rocket {
  /// # Example
  ///
  /// ```rust
- /// # #![feature(plugin, decl_macro)]
+ /// # #![feature(plugin, decl_macro, proc_macro_non_items)]
  /// # #![plugin(rocket_codegen)]
  /// # extern crate rocket;
+ /// # use rocket::routes;
  /// use rocket::Rocket;
  /// use rocket::fairing::AdHoc;
  ///

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

@@ -1,8 +1,10 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
+
 const RESPONSE_STRING: &'static str = "This is the body. Hello, world!";
 
 #[head("/")]

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

@@ -1,8 +1,9 @@
-#![feature(plugin, decl_macro, custom_derive)]
+#![feature(plugin, decl_macro, custom_derive, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::request::FlashMessage;
 use rocket::response::Flash;
 

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

@@ -1,8 +1,9 @@
-#![feature(plugin, decl_macro, custom_derive)]
+#![feature(plugin, decl_macro, custom_derive, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::request::Form;
 
 #[derive(FromForm)]

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

@@ -1,8 +1,9 @@
-#![feature(plugin, decl_macro, custom_derive)]
+#![feature(plugin, decl_macro, custom_derive, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::request::Form;
 
 #[derive(FromForm)]

core/lib/tests/head_handling.rs

@@ -1,8 +1,9 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::response::{status, content};
 
 #[get("/empty")]

core/lib/tests/limits.rs

@@ -1,4 +1,4 @@
-#![feature(plugin, decl_macro, custom_derive)]
+#![feature(plugin, decl_macro, custom_derive, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
@@ -17,6 +17,7 @@ fn index(form: Form<Simple>) -> String {
 
 mod limits_tests {
  use rocket;
+ use rocket::routes;
  use rocket::config::{Environment, Config, Limits};
  use rocket::local::Client;
  use rocket::http::{Status, ContentType};

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

@@ -1,8 +1,9 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::Outcome::*;
 use rocket::{Request, Data};
 use rocket::request::{self, FromRequest};

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

@@ -1,8 +1,9 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::http::Cookies;
 
 #[get("/")]
@@ -41,4 +42,4 @@ mod tests {
 
  assert_eq!(response.status(), Status::NotFound);
  }
-}
+}

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

@@ -1,10 +1,11 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
 use std::sync::atomic::{AtomicUsize, Ordering};
 
+use rocket::routes;
 use rocket::State;
 use rocket::fairing::AdHoc;
 use rocket::http::Method;

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

@@ -1,8 +1,10 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
+
 #[post("/", format = "application/json")]
 fn specified() -> &'static str {
  "specified"

core/lib/tests/query-and-non-query-dont-collide.rs

@@ -1,8 +1,10 @@
-#![feature(plugin, decl_macro, custom_derive)]
+#![feature(plugin, decl_macro, custom_derive, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
+
 #[derive(FromForm)]
 struct Query {
  field: String

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

@@ -1,8 +1,9 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::catchers;
 use rocket::response::Redirect;
 
 #[catch(404)]

core/lib/tests/route_guard.rs

@@ -1,9 +1,10 @@
-#![feature(plugin, decl_macro, custom_derive)]
+#![feature(plugin, decl_macro, custom_derive, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
 use std::path::PathBuf;
+use rocket::routes;
 use rocket::Route;
 
 #[get("/<path..>")]

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

@@ -1,8 +1,9 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::http::uri::Segments;
 
 #[get("/test/<path..>")]

core/lib/tests/strict_and_lenient_forms.rs

@@ -1,8 +1,9 @@
-#![feature(plugin, decl_macro, custom_derive)]
+#![feature(plugin, decl_macro, custom_derive, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
 
+use rocket::routes;
 use rocket::request::{Form, LenientForm};
 use rocket::http::RawStr;
 

examples/config/tests/common/mod.rs

@@ -1,3 +1,4 @@
+use rocket::routes;
 use rocket::{self, State};
 use rocket::fairing::AdHoc;
 use rocket::config::{self, Config, Environment, LoggingLevel};

examples/config/tests/development.rs

@@ -1,4 +1,4 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;

examples/config/tests/production.rs

@@ -1,4 +1,4 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;

examples/config/tests/staging.rs

@@ -1,4 +1,4 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;

examples/content_types/src/main.rs

@@ -1,4 +1,4 @@
-#![feature(plugin, decl_macro)]
+#![feature(plugin, decl_macro, proc_macro_non_items)]
 #![plugin(rocket_codegen)]
 
 extern crate rocket;
@@ -8,6 +8,7 @@ extern crate serde_derive;
 
 #[cfg(test)] mod tests;
 
+use rocket::{routes, catchers};
 use rocket::Request;
 use rocket::response::content;