drop chrono and use i64 for max age

src/middleware/identity.rs

@@ -53,7 +53,7 @@ use std::rc::Rc;
 use actix_service::{Service, Transform};
 use futures::future::{ok, Either, FutureResult};
 use futures::{Future, IntoFuture, Poll};
-use chrono::Duration;
+use time::Duration;
 
 use crate::cookie::{Cookie, CookieJar, Key, SameSite};
 use crate::error::{Error, Result};
@@ -427,16 +427,16 @@ impl CookieIdentityPolicy {
         self
     }
 
+    /// Sets the `max-age` field in the session cookie being built with given number of seconds.
+    pub fn max_age(self, seconds: i64) -> CookieIdentityPolicy {
+        self.max_age_time(Duration::seconds(seconds))
+    }
+
     /// Sets the `max-age` field in the session cookie being built with `chrono::Duration`.
     pub fn max_age_time(mut self, value: Duration) -> CookieIdentityPolicy {
         Rc::get_mut(&mut self.0).unwrap().max_age = Some(value);
         self
     }
-    /// Sets the `max-age` field in the session cookie being built with given number of seconds.
-    pub fn max_age(mut self, seconds: isize) -> CookieIdentityPolicy {
-        Rc::get_mut(&mut self.0).unwrap().max_age = Some(Duration::seconds(seconds as i64));
-        self
-    }
 
     /// Sets the `same_site` field in the session cookie being built.
     pub fn same_site(mut self, same_site: SameSite) -> Self {
@@ -547,7 +547,7 @@ mod tests {
                 .service(web::resource("/login").to(|id: Identity| {
                     id.remember("test".to_string());
                     HttpResponse::Ok()
-                }))
+                })),
         );
         let resp =
             test::call_service(&mut srv, TestRequest::with_uri("/login").to_request());
@@ -559,7 +559,7 @@ mod tests {
 
     #[test]
     fn test_identity_max_age() {
-        let seconds = 60isize;
+        let seconds = 60;
         let mut srv = test::init_service(
             App::new()
                 .wrap(IdentityService::new(
@@ -573,7 +573,7 @@ mod tests {
                 .service(web::resource("/login").to(|id: Identity| {
                     id.remember("test".to_string());
                     HttpResponse::Ok()
-                }))
+                })),
         );
         let resp =
             test::call_service(&mut srv, TestRequest::with_uri("/login").to_request());

src/middleware/normalize.rs

@@ -1,8 +1,8 @@
 //! `Middleware` to normalize request's URI
 
-use regex::Regex;
 use actix_service::{Service, Transform};
 use futures::future::{self, FutureResult};
+use regex::Regex;
 
 use crate::service::{ServiceRequest, ServiceResponse};
 
@@ -28,7 +28,7 @@ where
     fn new_transform(&self, service: S) -> Self::Future {
         future::ok(NormalizePathNormalization {
             service,
-            merge_slash: Regex::new("//+").unwrap()
+            merge_slash: Regex::new("//+").unwrap(),
         })
     }
 }
@@ -72,7 +72,6 @@ mod tests {
 
     use super::*;
     use crate::dev::ServiceRequest;
-    use crate::http::header::CONTENT_TYPE;
     use crate::test::{block_on, TestRequest};
     use crate::HttpResponse;
 

src/test.rs

@@ -335,12 +335,12 @@ impl TestRequest {
     pub fn post() -> TestRequest {
         TestRequest::default().method(Method::POST)
     }
-    
+
     /// Create TestRequest and set method to `Method::PUT`
     pub fn put() -> TestRequest {
         TestRequest::default().method(Method::PUT)
     }
-    
+
     /// Create TestRequest and set method to `Method::PATCH`
     pub fn patch() -> TestRequest {
         TestRequest::default().method(Method::PATCH)
@@ -521,7 +521,6 @@ mod tests {
         let result = read_response(&mut app, put_req);
         assert_eq!(result, Bytes::from_static(b"put!"));
 
-
         let patch_req = TestRequest::patch()
             .uri("/index.html")
             .header(header::CONTENT_TYPE, "application/json")