rust 1.37.0 changes

21re · Sep 12, 2019 · 9e25496 · 9e25496
1 parent 50a0ef5
commit 9e25496
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/auth_middleware.rs b/src/auth_middleware.rs
@@ -50,10 +50,10 @@ impl<S> FromRequest<S> for AuthContext {
   }
 }
 
-static SUBJECT_HEADER_NAME: &'static str = "X-Auth-Sub";
-static TOKEN_HEADER_NAME: &'static str = "X-Auth-Token";
-static ORGANIZATION_HEADER_NAME: &'static str = "X-Auth-Org";
-static SCOPES_HEADER_PREFIX: &'static str = "x-auth-scopes-";
+static SUBJECT_HEADER_NAME: &str = "X-Auth-Sub";
+static TOKEN_HEADER_NAME: &str = "X-Auth-Token";
+static ORGANIZATION_HEADER_NAME: &str = "X-Auth-Org";
+static SCOPES_HEADER_PREFIX: &str = "x-auth-scopes-";
 
 pub fn admin_scoped_action<F>(req: &HttpRequest, f: F) -> Result<HttpResponse>
 where

diff --git a/src/business_result.rs b/src/business_result.rs
@@ -22,7 +22,7 @@ where
   }
 }
 
-pub type AsyncBusinessResult<T> = Box<Future<Item = T, Error = Problem>>;
+pub type AsyncBusinessResult<T> = Box<dyn Future<Item = T, Error = Problem>>;
 
 pub fn success<T: 'static>(result: T) -> AsyncBusinessResult<T> {
   Box::new(future::ok(result))

diff --git a/src/metrics.rs b/src/metrics.rs
@@ -44,9 +44,9 @@ enum StatusCategory {
 impl StatusCategory {
   fn from_status(status: StatusCode) -> StatusCategory {
     match status.as_u16() {
-      200...299 => StatusCategory::Ok,
-      300...399 => StatusCategory::Redirect,
-      400...499 => StatusCategory::ClientError,
+      200..=299 => StatusCategory::Ok,
+      300..=399 => StatusCategory::Redirect,
+      400..=499 => StatusCategory::ClientError,
       _ => StatusCategory::InternalError,
     }
   }

diff --git a/src/service_requester.rs b/src/service_requester.rs
@@ -15,7 +15,7 @@ pub fn encode_url_component<S: AsRef<[u8]>>(value: S) -> String {
 #[derive(Clone)]
 pub struct ServiceRequester {
   token_creator: Addr<gatekeeper::TokenCreator>,
-  error_handler: &'static (Fn(client::ClientResponse) -> Box<Future<Item = Problem, Error = Problem>> + Sync),
+  error_handler: &'static (dyn Fn(client::ClientResponse) -> Box<dyn Future<Item = Problem, Error = Problem>> + Sync),
 }
 
 pub trait IntoClientRequest {
@@ -32,7 +32,7 @@ impl ServiceRequester {
 
   pub fn with_error_handler(
     &self,
-    error_handler: &'static (Fn(client::ClientResponse) -> Box<Future<Item = Problem, Error = Problem>> + Sync),
+    error_handler: &'static (dyn Fn(client::ClientResponse) -> Box<dyn Future<Item = Problem, Error = Problem>> + Sync),
   ) -> Self {
     ServiceRequester {
       token_creator: self.token_creator.clone(),

diff --git a/src/subject.rs b/src/subject.rs
@@ -10,10 +10,10 @@ pub enum Subject {
   Generic(String),
 }
 
-static ADMIN_SUBJECT: &'static str = "admin/";
-static CUSTOMER_SUBJECT: &'static str = "customer/";
-static SERVICE_SUBJECT: &'static str = "service/";
-static API_SUBJECT: &'static str = "api/";
+static ADMIN_SUBJECT: &str = "admin/";
+static CUSTOMER_SUBJECT: &str = "customer/";
+static SERVICE_SUBJECT: &str = "service/";
+static API_SUBJECT: &str = "api/";
 
 impl FromStr for Subject {
   type Err = ::actix_web::error::Error;

diff --git a/src/ws_try.rs b/src/ws_try.rs
@@ -24,7 +24,7 @@ pub trait FromClientResponse {
 pub enum WSTry<F> {
   MayBeSuccess(F),
   Failure(Problem),
-  FutureFailure(Box<Future<Item = Problem, Error = Problem>>),
+  FutureFailure(Box<dyn Future<Item = Problem, Error = Problem>>),
 }
 
 impl<T, F> Future for WSTry<F>
@@ -94,7 +94,7 @@ where
   R: IntoClientRequest,
   T: FromClientResponse<Result = T, FutureResult = F>,
   F: Future<Item = T, Error = Problem>,
-  E: Fn(client::ClientResponse) -> Box<Future<Item = Problem, Error = Problem>>,
+  E: Fn(client::ClientResponse) -> Box<dyn Future<Item = Problem, Error = Problem>>,
 {
   r#try(request).and_then(move |resp| {
     if resp.status().is_success() {
@@ -106,7 +106,7 @@ where
 }
 
 #[allow(clippy::needless_pass_by_value)]
-pub fn default_error_handler(response: client::ClientResponse) -> Box<Future<Item = Problem, Error = Problem>> {
+pub fn default_error_handler(response: client::ClientResponse) -> Box<dyn Future<Item = Problem, Error = Problem>> {
   Box::new(future::ok(Problem::for_status(
     response.status().as_u16(),
     format!("Service request failed: {}", response.status()),