Auto merge of #3340 - jtgeibel:update/conduit, r=Turbo87

Bump to latest route-recognizer and cookie crates

This bumps a few conduit crates to pull in the latest version of these dependencies.

r? `@Turbo87`

Author: bors

Cargo.lock

@@ -40,14 +40,14 @@ comrak = { version = "0.9", default-features = false }
 
 conduit = "0.9.0-alpha.5"
 conduit-conditional-get = "0.9.0-alpha.3"
-conduit-cookie = "0.9.0-alpha.4"
+conduit-cookie = "0.9.0-alpha.5"
 conduit-git-http-backend = "0.9.0-alpha.2"
 conduit-hyper = "0.3.0-alpha.7"
 conduit-middleware = "0.9.0-alpha.4"
-conduit-router = "0.9.0-alpha.3"
+conduit-router = "0.9.0-alpha.6"
 conduit-static = "0.9.0-alpha.3"
 
-cookie = { version = "0.14", features = ["secure"] }
+cookie = { version = "0.15", features = ["secure"] }
 ctrlc = { version = "3.0", features = ["termination"] }
 derive_deref = "1.1.1"
 dialoguer = "0.7.1"

Cargo.toml

@@ -175,8 +175,8 @@ impl Handler for R404 {
         let R404(ref router) = *self;
         match router.recognize(&req.method(), req.path()) {
             Ok(m) => {
-                req.mut_extensions().insert(m.params.clone());
-                m.handler.call(req)
+                req.mut_extensions().insert(m.params().clone());
+                m.handler().call(req)
             }
             Err(..) => Ok(NotFound.into()),
         }

src/router.rs

@@ -230,13 +230,12 @@ pub fn encode_session_header(session_key: &str, user_id: i32) -> String {
     map.insert("user_id".into(), user_id.to_string());
 
     // encode the map into a cookie value string
-    let session_middleware = SessionMiddleware::new(cookie_name, cookie_key.clone(), false);
-    let encoded = session_middleware.encode(&map);
+    let encoded = SessionMiddleware::encode(&map);
 
     // put the cookie into a signed cookie jar
     let cookie = Cookie::build(cookie_name, encoded).finish();
     let mut jar = cookie::CookieJar::new();
-    jar.signed(&cookie_key).add(cookie);
+    jar.signed_mut(&cookie_key).add(cookie);
 
     // read the raw cookie from the cookie jar
     jar.get(&cookie_name).unwrap().to_string()