Skip to content

Commit

Permalink
Replace uses of FnBox; Box<dyn FnOnce> now implements FnOnce.
Browse files Browse the repository at this point in the history
  • Loading branch information
KamilaBorowska authored and jebrosen committed Apr 13, 2019
1 parent 9b219dd commit 7ab1c42
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions core/lib/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use yansi::Color::{Red, Yellow, Blue};
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 = "2019-02-25";
const MIN_VERSION: &'static str = "1.34.0-nightly";
const MIN_DATE: &'static str = "2019-04-05";
const MIN_VERSION: &'static str = "1.35.0-nightly";

fn main() {
let ok_channel = supports_features();
Expand Down
23 changes: 12 additions & 11 deletions core/lib/src/fairing/ad_hoc.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use std::sync::Mutex;
use std::boxed::FnBox;

use {Rocket, Request, Response, Data};
use fairing::{Fairing, Kind, Info};
Expand Down Expand Up @@ -43,14 +42,14 @@ pub struct AdHoc {

enum AdHocKind {
/// An ad-hoc **attach** fairing. Called when the fairing is attached.
Attach(Mutex<Option<Box<FnBox(Rocket) -> Result<Rocket, Rocket> + Send + 'static>>>),
Attach(Mutex<Option<Box<dyn FnOnce(Rocket) -> Result<Rocket, Rocket> + Send + 'static>>>),
/// An ad-hoc **launch** fairing. Called just before Rocket launches.
Launch(Mutex<Option<Box<FnBox(&Rocket) + Send + 'static>>>),
Launch(Mutex<Option<Box<dyn FnOnce(&Rocket) + Send + 'static>>>),
/// An ad-hoc **request** fairing. Called when a request is received.
Request(Box<Fn(&mut Request, &Data) + Send + Sync + 'static>),
Request(Box<dyn Fn(&mut Request, &Data) + Send + Sync + 'static>),
/// An ad-hoc **response** fairing. Called when a response is ready to be
/// sent to a client.
Response(Box<Fn(&Request, &mut Response) + Send + Sync + 'static>),
Response(Box<dyn Fn(&Request, &mut Response) + Send + Sync + 'static>),
}

impl AdHoc {
Expand Down Expand Up @@ -146,9 +145,10 @@ impl Fairing for AdHoc {
fn on_attach(&self, rocket: Rocket) -> Result<Rocket, Rocket> {
if let AdHocKind::Attach(ref mutex) = self.kind {
let mut option = mutex.lock().expect("AdHoc::Attach lock");
option.take()
.expect("internal error: `on_attach` single-call invariant broken")
.call_box((rocket,))
let f = option
.take()
.expect("internal error: `on_attach` single-call invariant broken");
f(rocket)
} else {
Ok(rocket)
}
Expand All @@ -157,9 +157,10 @@ impl Fairing for AdHoc {
fn on_launch(&self, rocket: &Rocket) {
if let AdHocKind::Launch(ref mutex) = self.kind {
let mut option = mutex.lock().expect("AdHoc::Launch lock");
option.take()
.expect("internal error: `on_launch` single-call invariant broken")
.call_box((rocket, ))
let f = option
.take()
.expect("internal error: `on_launch` single-call invariant broken");
f(rocket)
}
}

Expand Down
1 change: 0 additions & 1 deletion core/lib/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#![feature(specialization)]
#![feature(decl_macro)]
#![feature(try_trait)]
#![feature(fnbox)]
#![feature(never_type)]
#![feature(proc_macro_hygiene)]
#![feature(crate_visibility_modifier)]
Expand Down

0 comments on commit 7ab1c42

Please sign in to comment.