Merge pull request #94 from fabricedesre/router-bump

Updating to recent rustc

Author: fabricedesre

.travis.yml

@@ -1,5 +1,5 @@
 language: rust
 rust:
-    - nightly-2016-11-25
+    - nightly-2017-03-02
 script:
     - RUST_BACKTRACE=1 cargo test

Cargo.toml

@@ -4,22 +4,22 @@ version = "0.1.0"
 authors = ["Fernando Jiménez Moreno <[email protected]>", "Salvador de la Puente González <[email protected]"]
 
 [dependencies]
-hyper = "0.9.10"
-iron = "0.4"
+hyper = "0.10"
+iron = "0.5"
 iron-cors = { git = "https://github.com/fxbox/iron-cors.git" }
 jwt = "0.4.0"
 libc = "0.2.7"
 pwhash = "0.1.1"
-router = "0.4"
+router = "0.5"
 rustc-serialize = "0.3.18"
-rusqlite = "0.7"
+rusqlite = "0.10"
 rust-crypto = "0.2.34"
 unicase = "1.4.0"
-urlencoded = "0.4.0"
+urlencoded = "0.5"
 uuid = { version = "0.3", features = ["v4"] }
 
 [dev-dependencies]
-iron-test = "0.4.0"
+iron-test = "0.5"
 stainless = "0.1.4"
 clippy = "0.0"
 url="1.2.0"

src/errors.rs

@@ -59,9 +59,9 @@ pub fn from_decoder_error(error: json::DecoderError) -> IronResult<Response> {
     match error {
         json::DecoderError::MissingFieldError(field) => {
             match field.as_ref() {
-                "name" => from_user_builder_error(UserBuilderError::Name),
-                "email" => from_user_builder_error(UserBuilderError::Email),
-                "password" => from_user_builder_error(UserBuilderError::Password),
+                "name" => from_user_builder_error(&UserBuilderError::Name),
+                "email" => from_user_builder_error(&UserBuilderError::Email),
+                "password" => from_user_builder_error(&UserBuilderError::Password),
                 _ => EndpointError::with(status::BadRequest, 400,
                                          Some("Missing field".to_owned()))
 
@@ -91,9 +91,9 @@ pub fn from_sqlite_error(error: rusqlite_error) -> IronResult<Response> {
     }
 }
 
-pub fn from_user_builder_error(error: UserBuilderError)
+pub fn from_user_builder_error(error: &UserBuilderError)
     -> IronResult<Response> {
-    let (errno, message) = match error {
+    let (errno, message) = match *error {
         UserBuilderError::Name => {
             (100, Some("Invalid user name".to_owned()))
         },

src/invitation_middleware.rs

@@ -9,7 +9,6 @@ use hyper::header::{Connection, Headers};
 use iron::AfterMiddleware;
 use iron::method::Method;
 use iron::prelude::*;
-use iron::response::ResponseBody;
 use rustc_serialize::json::{self, DecodeResult};
 
 #[derive(Debug, RustcEncodable)]
@@ -94,22 +93,19 @@ impl AfterMiddleware for InvitationMiddleware {
             return Ok(res);
         }
 
+        // Extract the body's payload.
         let mut payload = Vec::new();
         {
-            let mut response_body = ResponseBody::new(&mut payload);
-            match res.body {
-                Some(ref mut body) => body.write_body(&mut response_body).ok(),
-                None => None,
-            };
+            if let Some(ref mut body) = res.body {
+                body.write_body(&mut payload).ok();
+            }
         }
         let payload = String::from_utf8(payload).unwrap();
         let payload: DecodeResult<CreateUserResponse> = json::decode(&payload);
-        match payload {
-            Ok(payload) => {
-                self.send(&payload.email, &payload.activation_url);
-                Ok(res)
-            }
-            Err(_) => Ok(res),
+        if let Ok(payload) = payload {
+            self.send(&payload.email, &payload.activation_url);
         }
+
+        Ok(res)
     }
 }

src/lib.rs

@@ -1,6 +1,6 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #![feature(associated_consts, plugin)]
 
@@ -34,28 +34,28 @@ mod invitation_middleware;
 mod users_db;
 mod users_router;
 
-pub use users_db::UsersDb as UsersDb;
-pub use users_db::UserBuilder as UserBuilder;
-pub use users_db::UserBuilderError as UserBuilderError;
-pub use users_db::ReadFilter as ReadFilter;
-pub use users_db::User as User;
-pub use users_router::UsersRouter as UsersRouter;
-pub use auth_middleware::AuthMiddleware as AuthMiddleware;
-pub use auth_middleware::AuthEndpoint as AuthEndpoint;
-pub use auth_middleware::SessionToken as SessionToken;
+pub use users_db::UsersDb;
+pub use users_db::UserBuilder;
+pub use users_db::UserBuilderError;
+pub use users_db::ReadFilter;
+pub use users_db::User;
+pub use users_router::UsersRouter;
+pub use auth_middleware::AuthMiddleware;
+pub use auth_middleware::AuthEndpoint;
+pub use auth_middleware::SessionToken;
 
 pub struct UsersManager {
     db_file_path: String,
-    router: UsersRouter
+    router: UsersRouter,
 }
 
 impl UsersManager {
     /// Create the UsersManager.
     /// The database will be stored at `db_file_path`.
-    pub fn new(db_file_path: &str)-> Self {
+    pub fn new(db_file_path: &str) -> Self {
         UsersManager {
             db_file_path: String::from(db_file_path),
-            router: UsersRouter::new(db_file_path)
+            router: UsersRouter::new(db_file_path),
         }
     }
 
@@ -76,12 +76,10 @@ impl UsersManager {
     pub fn setup_invitation_middleware(&mut self,
                                        email_server: &str,
                                        invitation_url_prepath: &str) {
-        self.router.setup_invitation_middleware(email_server,
-                                                invitation_url_prepath);
+        self.router.setup_invitation_middleware(email_server, invitation_url_prepath);
     }
 
-    pub fn get_middleware(&self, auth_endpoints: Vec<AuthEndpoint>)
-                          -> AuthMiddleware {
+    pub fn get_middleware(&self, auth_endpoints: Vec<AuthEndpoint>) -> AuthMiddleware {
         AuthMiddleware::new(auth_endpoints, self.db_file_path.to_owned())
     }
 

src/users_router.rs

@@ -84,13 +84,6 @@ macro_rules! get_user_id_from_request {
                                        Some("Missing user id".to_owned()));
         }
 
-        let user_id: String = match user_id.parse() {
-            Ok(user_id) => user_id,
-            Err(_) => return EndpointError::with(
-                status::BadRequest, 400, Some("Invalid user id".to_owned())
-            )
-        };
-
         $user_id = user_id;
     }
 }
@@ -168,7 +161,7 @@ impl UsersRouter {
             Ok(user) => user,
             Err(user_with_error) => {
                 println!("{:?}", user_with_error);
-                return from_user_builder_error(user_with_error.error);
+                return from_user_builder_error(&user_with_error.error);
             }
         };
 
@@ -244,7 +237,7 @@ impl UsersRouter {
             Ok(user) => user,
             Err(user_with_error) => {
                 println!("{:?}", user_with_error);
-                return from_user_builder_error(user_with_error.error);
+                return from_user_builder_error(&user_with_error.error);
             }
         };
 
@@ -415,11 +408,11 @@ impl UsersRouter {
                     Ok(user) => user,
                     Err(user_with_error) => {
                         println!("{:?}", user_with_error);
-                        return from_user_builder_error(user_with_error.error);
+                        return from_user_builder_error(&user_with_error.error);
                     }
                 };
                 match db.update(&user) {
-                    Ok(_) => Ok(Response::with((status::NoContent))),
+                    Ok(_) => Ok(Response::with(status::NoContent)),
                     Err(error) => {
                         println!("{:?}", error);
                         from_sqlite_error(error)
@@ -480,7 +473,7 @@ impl UsersRouter {
                     Ok(user) => user,
                     Err(user_with_error) => {
                         println!("{:?}", user_with_error);
-                        return from_user_builder_error(user_with_error.error);
+                        return from_user_builder_error(&user_with_error.error);
                     }
                 };
                 match db.update(&user) {
@@ -557,7 +550,7 @@ impl UsersRouter {
 
                 if !users[0].id.is_empty() {
                     match db.delete(&users[0].id) {
-                        Ok(_) => Ok(Response::with((status::NoContent))),
+                        Ok(_) => Ok(Response::with(status::NoContent)),
                         Err(error) => {
                             println!("{:?}", error);
                             from_sqlite_error(error)