From 1da506ea5d8cd842380982b475ccf74c63211917 Mon Sep 17 00:00:00 2001 From: jeb Date: Sun, 19 Aug 2018 03:43:56 -0600 Subject: [PATCH] Remove use of the 'const_fn' feature. --- core/http/src/lib.rs | 1 - core/http/src/status.rs | 4 ++-- core/lib/src/lib.rs | 1 - examples/todo/src/main.rs | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/http/src/lib.rs b/core/http/src/lib.rs index c8148a32..37d075be 100644 --- a/core/http/src/lib.rs +++ b/core/http/src/lib.rs @@ -1,6 +1,5 @@ #![feature(specialization)] #![feature(proc_macro_non_items)] -#![feature(const_fn)] #![feature(try_from)] #![feature(crate_visibility_modifier)] #![recursion_limit="256"] diff --git a/core/http/src/status.rs b/core/http/src/status.rs index 671d50c6..1a2f8470 100644 --- a/core/http/src/status.rs +++ b/core/http/src/status.rs @@ -101,7 +101,7 @@ macro_rules! ctrs { #[doc=$reason] #[doc="."] #[allow(non_upper_case_globals)] - pub const $name: Status = Status::new($code, $reason); + pub const $name: Status = Status { code: $code, reason: $reason }; )+ /// Returns a Status given a standard status code `code`. If `code` is @@ -155,7 +155,7 @@ impl Status { /// assert_eq!(custom.to_string(), "299 Somewhat Successful".to_string()); /// ``` #[inline(always)] - pub const fn new(code: u16, reason: &'static str) -> Status { + pub fn new(code: u16, reason: &'static str) -> Status { Status { code, reason } } diff --git a/core/lib/src/lib.rs b/core/lib/src/lib.rs index 6e0ee5e0..7ab7be30 100644 --- a/core/lib/src/lib.rs +++ b/core/lib/src/lib.rs @@ -1,5 +1,4 @@ #![feature(specialization)] -#![feature(const_fn)] #![feature(plugin, decl_macro)] #![feature(try_trait)] #![feature(fnbox)] diff --git a/examples/todo/src/main.rs b/examples/todo/src/main.rs index 5d622e3c..9abe3442 100644 --- a/examples/todo/src/main.rs +++ b/examples/todo/src/main.rs @@ -1,4 +1,4 @@ -#![feature(plugin, decl_macro, custom_derive, const_fn)] +#![feature(plugin, decl_macro, custom_derive)] #![plugin(rocket_codegen)] #[macro_use] extern crate rocket;