From cb17fde4d6e4a9d7ef6fe9c55c4b478c18767942 Mon Sep 17 00:00:00 2001 From: Henning Holm Date: Fri, 14 Aug 2020 10:33:02 +0200 Subject: [PATCH] Make crate compile on Rust stable Rocket meanwhile works on Rust stable, so there is no reason to be limited to nightly. --- examples/fairing.rs | 1 - examples/guard.rs | 1 - examples/json.rs | 2 -- examples/manual.rs | 1 - examples/mix.rs | 1 - rust-toolchain | 1 - tests/fairing.rs | 1 - tests/guard.rs | 1 - tests/headers.rs | 1 - tests/manual.rs | 1 - tests/mix.rs | 1 - 11 files changed, 12 deletions(-) delete mode 100644 rust-toolchain diff --git a/examples/fairing.rs b/examples/fairing.rs index 30cc18c..9e33b4b 100644 --- a/examples/fairing.rs +++ b/examples/fairing.rs @@ -1,4 +1,3 @@ -#![feature(proc_macro_hygiene, decl_macro)] use std::error::Error; use rocket::http::Method; diff --git a/examples/guard.rs b/examples/guard.rs index 15e683d..28f409a 100644 --- a/examples/guard.rs +++ b/examples/guard.rs @@ -1,4 +1,3 @@ -#![feature(proc_macro_hygiene, decl_macro)] use std::error::Error; use std::io::Cursor; diff --git a/examples/json.rs b/examples/json.rs index f19846a..1e49cf1 100644 --- a/examples/json.rs +++ b/examples/json.rs @@ -1,8 +1,6 @@ //! This example is to demonstrate the JSON serialization and deserialization of the Cors settings //! //! Note: This requires the `serialization` feature which is enabled by default. -#![feature(proc_macro_hygiene, decl_macro)] - use rocket_cors as cors; use crate::cors::{AllowedHeaders, AllowedOrigins, CorsOptions}; diff --git a/examples/manual.rs b/examples/manual.rs index be5e678..9749664 100644 --- a/examples/manual.rs +++ b/examples/manual.rs @@ -1,4 +1,3 @@ -#![feature(proc_macro_hygiene, decl_macro)] use std::io::Cursor; use rocket::error::Error; diff --git a/examples/mix.rs b/examples/mix.rs index 17ab817..515bc94 100644 --- a/examples/mix.rs +++ b/examples/mix.rs @@ -3,7 +3,6 @@ //! In this example, you typically have an application wide `Cors` struct except for one specific //! `ping` route that you want to allow all Origins to access. -#![feature(proc_macro_hygiene, decl_macro)] use rocket::error::Error; use rocket::http::Method; use rocket::response::Responder; diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index bf867e0..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly diff --git a/tests/fairing.rs b/tests/fairing.rs index a3498e6..c791374 100644 --- a/tests/fairing.rs +++ b/tests/fairing.rs @@ -1,5 +1,4 @@ //! This crate tests using `rocket_cors` using Fairings -#![feature(proc_macro_hygiene, decl_macro)] use rocket::http::hyper; use rocket::http::Method; use rocket::http::{Header, Status}; diff --git a/tests/guard.rs b/tests/guard.rs index b820047..3d0c9a9 100644 --- a/tests/guard.rs +++ b/tests/guard.rs @@ -1,5 +1,4 @@ //! This crate tests using `rocket_cors` using the per-route handling with request guard -#![feature(proc_macro_hygiene, decl_macro)] use rocket_cors as cors; use rocket::http::hyper; diff --git a/tests/headers.rs b/tests/headers.rs index 9c86d3d..7becb6c 100644 --- a/tests/headers.rs +++ b/tests/headers.rs @@ -1,5 +1,4 @@ //! This crate tests that all the request headers are parsed correctly in the round trip -#![feature(proc_macro_hygiene, decl_macro)] use std::ops::Deref; use rocket::http::hyper; diff --git a/tests/manual.rs b/tests/manual.rs index b335102..f01c915 100644 --- a/tests/manual.rs +++ b/tests/manual.rs @@ -1,5 +1,4 @@ //! This crate tests using `rocket_cors` using manual mode -#![feature(proc_macro_hygiene, decl_macro)] use rocket::http::hyper; use rocket::http::Method; use rocket::http::{Header, Status}; diff --git a/tests/mix.rs b/tests/mix.rs index bbd3e08..d0bc6e0 100644 --- a/tests/mix.rs +++ b/tests/mix.rs @@ -2,7 +2,6 @@ //! //! In this example, you typically have an application wide `Cors` struct except for one specific //! `ping` route that you want to allow all Origins to access. -#![feature(proc_macro_hygiene, decl_macro)] use rocket::http::hyper; use rocket::http::{Header, Method, Status}; use rocket::local::blocking::Client;