prepare actix-session release

actix-session/CHANGES.md

@@ -1,12 +1,12 @@
 # Changes
 
-## [0.2.0] - 2019-07-03
+## [0.2.0] - 2019-07-08
+
 *  Enhanced ``actix-session`` to facilitate state changes.  Use ``Session.renew()``
    at successful login to cycle a session (new key/cookie but keeps state).
-   Use ``Session.purge()`` at logout to invalid a session cookie (and remove 
+   Use ``Session.purge()`` at logout to invalid a session cookie (and remove
    from redis cache, if applicable).
 
-
 ## [0.1.1] - 2019-06-03
 
 * Fix optional cookie session support

actix-session/README.md

@@ -6,4 +6,4 @@
 * [API Documentation](https://docs.rs/actix-session/)
 * [Chat on gitter](https://gitter.im/actix/actix)
 * Cargo package: [actix-session](https://crates.io/crates/actix-session)
-* Minimum supported Rust version: 1.33 or later
+* Minimum supported Rust version: 1.34 or later

actix-session/src/cookie.rs

@@ -120,8 +120,7 @@ impl CookieSessionInner {
     }
 
     /// invalidates session cookie
-    fn remove_cookie<B>(&self, res: &mut ServiceResponse<B>)
+    fn remove_cookie<B>(&self, res: &mut ServiceResponse<B>) -> Result<(), Error> {
-                    -> Result<(), Error> {
         let mut cookie = Cookie::named(self.name.clone());
         cookie.set_value("");
         cookie.set_max_age(time::Duration::seconds(0));
@@ -317,7 +316,7 @@ where
     }
 
     /// On first request, a new session cookie is returned in response, regardless
-    /// of whether any session state is set.  With subsequent requests, if the 
+    /// of whether any session state is set.  With subsequent requests, if the
     /// session state changes, then set-cookie is returned in response.  As
     /// a user logs out, call session.purge() to set SessionStatus accordingly
     /// and this will trigger removal of the session cookie in the response.
@@ -329,21 +328,24 @@ where
         Box::new(self.service.call(req).map(move |mut res| {
             match Session::get_changes(&mut res) {
                 (SessionStatus::Changed, Some(state))
-                 | (SessionStatus::Renewed, Some(state)) => 
+                | (SessionStatus::Renewed, Some(state)) => {
-                    res.checked_expr(|res| inner.set_cookie(res, state)),
+                    res.checked_expr(|res| inner.set_cookie(res, state))
+                }
                 (SessionStatus::Unchanged, _) =>
-                    // set a new session cookie upon first request (new client)
+                // set a new session cookie upon first request (new client)
+                {
                     if is_new {
                         let state: HashMap<String, String> = HashMap::new();
                         res.checked_expr(|res| inner.set_cookie(res, state.into_iter()))
                     } else {
                         res
-                    },
+                    }
+                }
                 (SessionStatus::Purged, _) => {
-				    inner.remove_cookie(&mut res);
+                    inner.remove_cookie(&mut res);
-					res
+                    res
-				},
+                }
-                _ => res
+                _ => res,
             }
         }))
     }

actix-session/src/lib.rs

@@ -103,7 +103,7 @@ pub enum SessionStatus {
     Changed,
     Purged,
     Renewed,
-    Unchanged
+    Unchanged,
 }
 impl Default for SessionStatus {
     fn default() -> SessionStatus {
@@ -183,7 +183,10 @@ impl Session {
 
     pub fn get_changes<B>(
         res: &mut ServiceResponse<B>,
-    ) -> (SessionStatus, Option<impl Iterator<Item = (String, String)>>) {
+    ) -> (
+        SessionStatus,
+        Option<impl Iterator<Item = (String, String)>>,
+    ) {
         if let Some(s_impl) = res
             .request()
             .extensions()
@@ -286,7 +289,6 @@ mod tests {
         assert_eq!(session.0.borrow().status, SessionStatus::Purged);
     }
 
-
     #[test]
     fn renew_session() {
         let mut req = test::TestRequest::default().to_srv_request();