Merge pull request #6 from jtgeibel/upgrade/base64

Bump the version of base64 from 0.6 to 0.11

Author: carols10cents

Cargo.toml

@@ -4,10 +4,10 @@ description = "Cookie and session middleware for conduit-based stacks"
 license = "MIT"
 name = "conduit-cookie"
 repository = "https://github.com/conduit-rust/conduit-cookie"
-version = "0.8.5"
+version = "0.8.6"
 
 [dependencies]
-base64 = "0.6"
+base64 = "0.11"
 conduit = "0.8"
 conduit-middleware = "0.8"
 

src/lib.rs

@@ -35,7 +35,7 @@ fn parse_pair(key_value: &str) -> Option<(String, String)> {
 }
 
 impl conduit_middleware::Middleware for Middleware {
-    fn before(&self, req: &mut Request) -> Result<(), Box<Error + Send>> {
+    fn before(&self, req: &mut dyn Request) -> Result<(), Box<dyn Error + Send>> {
         let jar = {
             let headers = req.headers();
             let mut jar = CookieJar::new();
@@ -56,9 +56,9 @@ impl conduit_middleware::Middleware for Middleware {
 
     fn after(
         &self,
-        req: &mut Request,
-        res: Result<Response, Box<Error + Send>>,
-    ) -> Result<Response, Box<Error + Send>> {
+        req: &mut dyn Request,
+        res: Result<Response, Box<dyn Error + Send>>,
+    ) -> Result<Response, Box<dyn Error + Send>> {
         let mut res = res?;
         {
             let jar = req.cookies();
@@ -114,7 +114,7 @@ mod tests {
         app.add(Middleware::new());
         assert!(app.call(&mut req).is_ok());
 
-        fn test(req: &mut Request) -> io::Result<Response> {
+        fn test(req: &mut dyn Request) -> io::Result<Response> {
             assert!(req.cookies().get("foo").is_some());
             Ok(Response {
                 status: (200, "OK"),
@@ -133,7 +133,7 @@ mod tests {
         let v = &response.headers["Set-Cookie"];
         assert_eq!(&v[..], ["foo=bar".to_string()]);
 
-        fn test(req: &mut Request) -> io::Result<Response> {
+        fn test(req: &mut dyn Request) -> io::Result<Response> {
             let c = Cookie::new("foo".to_string(), "bar".to_string());
             req.cookies_mut().add(c);
             Ok(Response {
@@ -154,7 +154,7 @@ mod tests {
         v.sort();
         assert_eq!(&v[..], ["baz=qux".to_string(), "foo=bar".to_string()]);
 
-        fn test(req: &mut Request) -> io::Result<Response> {
+        fn test(req: &mut dyn Request) -> io::Result<Response> {
             let c = Cookie::new("foo".to_string(), "bar".to_string());
             req.cookies_mut().add(c);
             let c2 = Cookie::new("baz".to_string(), "qux".to_string());

src/session.rs

@@ -61,7 +61,7 @@ impl SessionMiddleware {
 }
 
 impl conduit_middleware::Middleware for SessionMiddleware {
-    fn before(&self, req: &mut Request) -> Result<(), Box<Error + Send>> {
+    fn before(&self, req: &mut dyn Request) -> Result<(), Box<dyn Error + Send>> {
         let session = {
             let jar = req.cookies_mut().signed(&self.key);
             jar.get(&self.cookie_name)
@@ -74,9 +74,9 @@ impl conduit_middleware::Middleware for SessionMiddleware {
 
     fn after(
         &self,
-        req: &mut Request,
-        res: Result<Response, Box<Error + Send>>,
-    ) -> Result<Response, Box<Error + Send>> {
+        req: &mut dyn Request,
+        res: Result<Response, Box<dyn Error + Send>>,
+    ) -> Result<Response, Box<dyn Error + Send>> {
         let cookie = {
             let session = req.mut_extensions().find::<Session>();
             let session = session.expect("session must be present after request");
@@ -145,7 +145,7 @@ mod test {
         app.add(SessionMiddleware::new("lol", key, false));
         assert!(app.call(&mut req).is_ok());
 
-        fn set_session(req: &mut Request) -> io::Result<Response> {
+        fn set_session(req: &mut dyn Request) -> io::Result<Response> {
             assert!(
                 req.session()
                     .insert("foo".to_string(), "bar".to_string())
@@ -157,7 +157,7 @@ mod test {
                 body: Box::new(Cursor::new(Vec::new())),
             })
         }
-        fn use_session(req: &mut Request) -> io::Result<Response> {
+        fn use_session(req: &mut dyn Request) -> io::Result<Response> {
             assert_eq!(*req.session().get("foo").unwrap(), "bar");
             Ok(Response {
                 status: (200, "OK"),