From 780f290a4eaf0b6941c9c10ef581a8ba7a66312d Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Thu, 2 Aug 2018 12:07:28 +0200
Subject: Explicit import of utils::DbConn in models too.

---
 src/models/post.rs | 14 +++++++-------
 src/models/user.rs | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/models/post.rs b/src/models/post.rs
index be44dda..bde8e54 100644
--- a/src/models/post.rs
+++ b/src/models/post.rs
@@ -1,7 +1,7 @@
 use diesel;
 use diesel::prelude::*;
 use schema::posts;
-use utils;
+use utils::DbConn;
 
 #[derive(AsChangeset, FromForm, Identifiable, Serialize, Queryable)]
 pub struct Post {
@@ -20,7 +20,7 @@ pub struct NewPost {
 }
 
 impl Post {
-    pub fn get_all(conn: utils::DbConn) -> Vec<Post> {
+    pub fn get_all(conn: DbConn) -> Vec<Post> {
         use schema::posts::dsl::*;
         posts
             .filter(published.eq(false))
@@ -29,7 +29,7 @@ impl Post {
             .expect("Error loading posts")
     }
 
-    fn get_internal(post_id: i32, conn: &utils::DbConn) -> Post {
+    fn get_internal(post_id: i32, conn: &DbConn) -> Post {
         use schema::posts::dsl::*;
         posts
             .find(post_id)
@@ -37,11 +37,11 @@ impl Post {
             .expect(&format!("Unable to find post with id={}", post_id))
     }
 
-    pub fn get(post_id: i32, conn: utils::DbConn) -> Post {
+    pub fn get(post_id: i32, conn: DbConn) -> Post {
         Post::get_internal(post_id, &conn)
     }
 
-    pub fn create(new_post: &NewPost, conn: utils::DbConn) {
+    pub fn create(new_post: &NewPost, conn: DbConn) {
         use schema::posts::dsl::*;
         diesel::insert_into(posts)
             .values(new_post)
@@ -49,7 +49,7 @@ impl Post {
             .expect("Error saving post.");
     }
 
-    pub fn update(updated_post: &Post, conn: utils::DbConn) {
+    pub fn update(updated_post: &Post, conn: DbConn) {
         let p = Post::get_internal(updated_post.id, &conn);
         diesel::update(&p)
             .set(updated_post)
@@ -57,7 +57,7 @@ impl Post {
             .expect("Error saving post.");
     }
 
-    pub fn delete(post_id: i32, conn: utils::DbConn) {
+    pub fn delete(post_id: i32, conn: DbConn) {
         use schema::posts::dsl::*;
         diesel::delete(posts.filter(id.eq(post_id)))
             .execute(&*conn)
diff --git a/src/models/user.rs b/src/models/user.rs
index 37c5333..08c54d7 100644
--- a/src/models/user.rs
+++ b/src/models/user.rs
@@ -1,7 +1,7 @@
 use diesel;
 use diesel::prelude::*;
 use schema::users;
-use utils;
+use utils::DbConn;
 
 #[derive(AsChangeset, Clone, FromForm, Identifiable, Serialize, Queryable)]
 pub struct User {
@@ -13,12 +13,12 @@ pub struct User {
 }
 
 impl User {
-    pub fn all(conn: utils::DbConn) -> QueryResult<Vec<User>> {
+    pub fn all(conn: DbConn) -> QueryResult<Vec<User>> {
         use schema::users::dsl::*;
         users.load::<User>(&*conn)
     }
 
-    pub fn by_id(user_id: i32, conn: &utils::DbConn) -> QueryResult<User> {
+    pub fn by_id(user_id: i32, conn: &DbConn) -> QueryResult<User> {
         use schema::users::dsl::*;
         users
             .filter(id.eq(user_id))
@@ -26,26 +26,26 @@ impl User {
             .map(|ref v| v[0].clone())
     }
 
-    pub fn by_email(user_email: &str, conn: utils::DbConn) -> QueryResult<User> {
+    pub fn by_email(user_email: &str, conn: DbConn) -> QueryResult<User> {
         use schema::users::dsl::*;
         users
             .filter(email.eq(user_email))
             .get_result::<User>(&*conn)
     }
 
-    pub fn create(new_user: &NewUser, conn: utils::DbConn) -> QueryResult<User> {
+    pub fn create(new_user: &NewUser, conn: DbConn) -> QueryResult<User> {
         use schema::users::dsl::*;
         diesel::insert_into(users)
             .values(new_user)
             .get_result(&*conn)
     }
 
-    pub fn update(user: &User, conn: &utils::DbConn) -> QueryResult<User> {
+    pub fn update(user: &User, conn: &DbConn) -> QueryResult<User> {
         use schema::users::dsl::*;
         user.save_changes(&*conn)
     }
 
-    pub fn delete(user_id: i32, conn: utils::DbConn) -> QueryResult<User> {
+    pub fn delete(user_id: i32, conn: DbConn) -> QueryResult<User> {
         use schema::users::dsl::*;
         diesel::delete(users.filter(id.eq(user_id))).get_result::<User>(&*conn)
     }
-- 
cgit v1.2.3