summaryrefslogtreecommitdiff
path: root/src/db.rs
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2017-06-17 22:31:27 -0400
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2017-06-17 22:31:27 -0400
commit76b90acb735d3ed2b3052abc1d2403287af83619 (patch)
tree857de2ebee3d2b6ea802aa1ef249ea34bb0e0908 /src/db.rs
parent1e5f237c20310cbf6ace17b6a7b05298429aca46 (diff)
rustfmt: Reformatted all the code.
Diffstat (limited to 'src/db.rs')
-rw-r--r--src/db.rs28
1 files changed, 17 insertions, 11 deletions
diff --git a/src/db.rs b/src/db.rs
index ba4025f..872ae60 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -1,4 +1,4 @@
-use rusqlite::{Connection};
+use rusqlite::Connection;
use std;
use auth::HashedPassword;
@@ -19,25 +19,31 @@ pub fn init(conn: &mut Connection) -> Result<()> {
CREATE TABLE IF NOT EXISTS users
(username TEXT PRIMARY KEY, salt TEXT, passwd TEXT);
COMMIT;
- ").unwrap();
+ ")
+ .unwrap();
}
Ok(())
}
-pub fn insert_user(conn: &Connection,
- username: &str,
- password: &HashedPassword) -> Result<()> {
+pub fn insert_user(conn: &Connection, username: &str, password: &HashedPassword) -> Result<()> {
conn.execute("INSERT INTO users (username, salt, passwd)
VALUES (?1, ?2, ?3)",
- &[&username, &password.salt, &password.enc]).unwrap();
+ &[&username, &password.salt, &password.enc])
+ .unwrap();
Ok(())
}
-pub fn lookup_user(conn: &Connection,
- username: &str) -> Result<Option<HashedPassword>> {
- let mut stmt = conn.prepare("SELECT salt, passwd FROM users WHERE username = ?").unwrap();
+pub fn lookup_user(conn: &Connection, username: &str) -> Result<Option<HashedPassword>> {
+ let mut stmt = conn.prepare("SELECT salt, passwd FROM users WHERE username = ?")
+ .unwrap();
let result = stmt.query_map(&[&username], |row| {
- HashedPassword {salt: row.get(0), enc: row.get(1)}
- }).unwrap().map(|v| v.unwrap()).next();
+ HashedPassword {
+ salt: row.get(0),
+ enc: row.get(1),
+ }
+ })
+ .unwrap()
+ .map(|v| v.unwrap())
+ .next();
Ok(result)
}