diff options
author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-02-03 23:00:23 -0500 |
---|---|---|
committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-02-03 23:00:23 -0500 |
commit | e614b1eec14d03e72b6e9fba15129973df1dd704 (patch) | |
tree | 18105248e7d4f6a85b5323cea91936200efd1f28 /src/db.rs | |
parent | 6d0a4d03705b96b252a6b29d3b8c188b9c903b89 (diff) |
Fix rust warnings by removing dead code
Diffstat (limited to 'src/db.rs')
-rw-r--r-- | src/db.rs | 43 |
1 files changed, 19 insertions, 24 deletions
@@ -1,14 +1,13 @@ use crate::error::Error; use crate::models; use bcrypt; +use chrono::DateTime; +use chrono::Utc; use diesel::connection::Connection; use diesel::pg::PgConnection; use diesel::ExpressionMethods; use diesel::QueryDsl; use diesel::RunQueryDsl; -use std::time::Duration; -use chrono::DateTime; -use chrono::Utc; pub const COST: u32 = 10; @@ -102,9 +101,7 @@ pub fn get_strava_token( Ok(token) } -pub fn insert_task( - conn: &PgConnection, - task: &models::NewTask) -> Result<i64, Error> { +pub fn insert_task(conn: &PgConnection, task: &models::NewTask) -> Result<i64, Error> { use crate::schema::tasks; let id = diesel::insert_into(tasks::table) .values(task) @@ -113,38 +110,36 @@ pub fn insert_task( Ok(id) } -fn update_task_inner(conn: &PgConnection, task: &models::Task) - -> Result<models::Task, Error> { +fn update_task_inner(conn: &PgConnection, task: &models::Task) -> Result<models::Task, Error> { use crate::schema::tasks; - diesel::delete(tasks::table.filter(tasks::columns::id.eq(task.id))) - .execute(conn)?; + diesel::delete(tasks::table.filter(tasks::columns::id.eq(task.id))).execute(conn)?; - let new_id = insert_task(conn, &models::NewTask { - start_at: task.start_at, - state: task.state, - username: &task.username, - payload: &task.payload, - })?; + let new_id = insert_task( + conn, + &models::NewTask { + start_at: task.start_at, + state: task.state, + username: &task.username, + payload: &task.payload, + }, + )?; - let new_task = tasks::table.find(new_id) - .get_result::<models::Task>(conn)?; + let new_task = tasks::table.find(new_id).get_result::<models::Task>(conn)?; Ok(new_task) } -fn update_task(conn: &PgConnection, task: &models::Task) -> Result<models::Task, Error> { - conn.transaction(|| { - update_task_inner(conn, task) - }) +pub fn update_task(conn: &PgConnection, task: &models::Task) -> Result<models::Task, Error> { + conn.transaction(|| update_task_inner(conn, task)) } pub fn take_task( conn: &PgConnection, state: models::TaskState, start_before: DateTime<Utc>, - eta: DateTime<Utc>) - -> Result<models::Task, Error> { + eta: DateTime<Utc>, +) -> Result<models::Task, Error> { use crate::schema::tasks; conn.transaction(|| { |