Skip to content

Commit 9d88b28

Browse files
committed
Bump to latest route-recognizer and cookie crates
This bumps a few conduit crates to pull in the latest version of these dependencies.
1 parent 575b2fb commit 9d88b28

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

Cargo.lock

Lines changed: 12 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ comrak = { version = "0.9", default-features = false }
4040

4141
conduit = "0.9.0-alpha.5"
4242
conduit-conditional-get = "0.9.0-alpha.3"
43-
conduit-cookie = "0.9.0-alpha.4"
43+
conduit-cookie = "0.9.0-alpha.5"
4444
conduit-git-http-backend = "0.9.0-alpha.2"
4545
conduit-hyper = "0.3.0-alpha.7"
4646
conduit-middleware = "0.9.0-alpha.4"
47-
conduit-router = "0.9.0-alpha.3"
47+
conduit-router = "0.9.0-alpha.6"
4848
conduit-static = "0.9.0-alpha.3"
4949

50-
cookie = { version = "0.14", features = ["secure"] }
50+
cookie = { version = "0.15", features = ["secure"] }
5151
ctrlc = { version = "3.0", features = ["termination"] }
5252
derive_deref = "1.1.1"
5353
dialoguer = "0.7.1"

src/router.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ impl Handler for R404 {
175175
let R404(ref router) = *self;
176176
match router.recognize(&req.method(), req.path()) {
177177
Ok(m) => {
178-
req.mut_extensions().insert(m.params.clone());
179-
m.handler.call(req)
178+
req.mut_extensions().insert(m.params().clone());
179+
m.handler().call(req)
180180
}
181181
Err(..) => Ok(NotFound.into()),
182182
}

src/tests/util.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,12 @@ pub fn encode_session_header(session_key: &str, user_id: i32) -> String {
230230
map.insert("user_id".into(), user_id.to_string());
231231

232232
// encode the map into a cookie value string
233-
let session_middleware = SessionMiddleware::new(cookie_name, cookie_key.clone(), false);
234-
let encoded = session_middleware.encode(&map);
233+
let encoded = SessionMiddleware::encode(&map);
235234

236235
// put the cookie into a signed cookie jar
237236
let cookie = Cookie::build(cookie_name, encoded).finish();
238237
let mut jar = cookie::CookieJar::new();
239-
jar.signed(&cookie_key).add(cookie);
238+
jar.signed_mut(&cookie_key).add(cookie);
240239

241240
// read the raw cookie from the cookie jar
242241
jar.get(&cookie_name).unwrap().to_string()

0 commit comments

Comments
 (0)