aboutsummaryrefslogtreecommitdiffstats
path: root/src/controllers
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2018-08-02 13:57:55 +0200
committerHarald Eilertsen <haraldei@anduin.net>2018-08-02 13:57:55 +0200
commit0cdfefe02d7ade0744adb1bd44796e48440ea52a (patch)
tree3d35188b28aa6f54482004fe1aeaec78cc755167 /src/controllers
parent780f290a4eaf0b6941c9c10ef581a8ba7a66312d (diff)
downloadrocket-blog-0cdfefe02d7ade0744adb1bd44796e48440ea52a.tar.gz
rocket-blog-0cdfefe02d7ade0744adb1bd44796e48440ea52a.tar.bz2
rocket-blog-0cdfefe02d7ade0744adb1bd44796e48440ea52a.zip
Fix clippy issues.
Diffstat (limited to 'src/controllers')
-rw-r--r--src/controllers/home_controller.rs7
-rw-r--r--src/controllers/login_controller.rs5
-rw-r--r--src/controllers/posts_controller.rs11
-rw-r--r--src/controllers/users_controller.rs11
4 files changed, 19 insertions, 15 deletions
diff --git a/src/controllers/home_controller.rs b/src/controllers/home_controller.rs
index ba2ea0c..cc0fa8a 100644
--- a/src/controllers/home_controller.rs
+++ b/src/controllers/home_controller.rs
@@ -1,3 +1,4 @@
+#![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
use models::Post;
use posts_controller::ShowPostTemplate;
use rocket::{request::FlashMessage, response::NamedFile, Route};
@@ -17,9 +18,9 @@ implement_responder_for!(IndexTemplate);
fn index(flash: Option<FlashMessage>, conn: DbConn) -> Page<IndexTemplate> {
Page {
title: String::from("Bloggen"),
- flash: flash,
+ flash,
content: IndexTemplate {
- posts: Post::get_all(conn)
+ posts: Post::get_all(&conn)
.into_iter()
.map(|p| ShowPostTemplate { post: p })
.collect(),
@@ -29,7 +30,7 @@ fn index(flash: Option<FlashMessage>, conn: DbConn) -> Page<IndexTemplate> {
#[get("/", format = "application/json")]
fn index_json(conn: DbConn) -> Json<Vec<Post>> {
- Json(Post::get_all(conn))
+ Json(Post::get_all(&conn))
}
//
diff --git a/src/controllers/login_controller.rs b/src/controllers/login_controller.rs
index 6ee5de1..8800c59 100644
--- a/src/controllers/login_controller.rs
+++ b/src/controllers/login_controller.rs
@@ -1,3 +1,4 @@
+#![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
use models::User;
use rocket::{
request::{FlashMessage, Form},
@@ -16,7 +17,7 @@ implement_responder_for!(LoginTemplate);
pub fn new(flash: Option<FlashMessage>) -> Page<LoginTemplate> {
Page {
title: String::from("Log in"),
- flash: flash,
+ flash,
content: LoginTemplate {},
}
}
@@ -30,7 +31,7 @@ pub struct LoginForm {
#[post("/create", data = "<login>")]
pub fn create(login: Form<LoginForm>, conn: DbConn) -> Flash<Redirect> {
let login = login.get();
- if let Ok(user) = User::by_email(&login.email, conn) {
+ if let Ok(user) = User::by_email(&login.email, &conn) {
if user.password == login.password {
return Flash::success(
Redirect::to("/"),
diff --git a/src/controllers/posts_controller.rs b/src/controllers/posts_controller.rs
index 99ff651..781f9f5 100644
--- a/src/controllers/posts_controller.rs
+++ b/src/controllers/posts_controller.rs
@@ -1,3 +1,4 @@
+#![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
use comrak::{markdown_to_html, ComrakOptions};
use models::{NewPost, Post};
use rocket::{
@@ -28,7 +29,7 @@ fn new(_conn: DbConn) -> Page<NewPostTemplate> {
#[post("/create", data = "<post>")]
fn create(post: Form<NewPost>, conn: DbConn) -> Flash<Redirect> {
- Post::create(post.get(), conn);
+ Post::create(post.get(), &conn);
Flash::success(Redirect::to("/"), "Post successfully created!")
}
@@ -48,7 +49,7 @@ impl ShowPostTemplate {
#[get("/<id>", format = "text/html")]
fn show(id: i32, conn: DbConn) -> Page<ShowPostTemplate> {
- let p = Post::get(id, conn);
+ let p = Post::get(id, &conn);
Page {
title: p.title.clone(),
flash: None,
@@ -66,7 +67,7 @@ implement_responder_for!(EditPostTemplate);
#[get("/<id>/edit", format = "text/html")]
fn edit(id: i32, conn: DbConn) -> Page<EditPostTemplate> {
- let p = Post::get(id, conn);
+ let p = Post::get(id, &conn);
Page {
title: String::from("Edit post"),
flash: None,
@@ -76,13 +77,13 @@ fn edit(id: i32, conn: DbConn) -> Page<EditPostTemplate> {
#[post("/update", data = "<post>")]
fn update(post: Form<Post>, conn: DbConn) -> Flash<Redirect> {
- Post::update(post.get(), conn);
+ Post::update(post.get(), &conn);
Flash::success(Redirect::to("/"), "Post updated successfully!")
}
#[get("/<id>/delete", format = "text/html")]
fn delete(id: i32, conn: DbConn) -> Flash<Redirect> {
- Post::delete(id, conn);
+ Post::delete(id, &conn);
Flash::success(Redirect::to("/"), "Post deleted!")
}
diff --git a/src/controllers/users_controller.rs b/src/controllers/users_controller.rs
index 4713705..19d5970 100644
--- a/src/controllers/users_controller.rs
+++ b/src/controllers/users_controller.rs
@@ -1,3 +1,4 @@
+#![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
use models::{NewUser, User};
use rocket::{
request::{FlashMessage, Form},
@@ -18,9 +19,9 @@ implement_responder_for!(UsersTemplate);
fn index(flash: Option<FlashMessage>, conn: DbConn) -> Page<UsersTemplate> {
Page {
title: String::from("Users"),
- flash: flash,
+ flash,
content: UsersTemplate {
- users: User::all(conn).unwrap(),
+ users: User::all(&conn).unwrap(),
},
}
}
@@ -46,7 +47,7 @@ fn edit(id: i32, conn: DbConn) -> Page<EditUserTemplate> {
#[get("/<id>/delete")]
fn delete(id: i32, route: &Route, conn: DbConn) -> Flash<Redirect> {
- match User::delete(id, conn) {
+ match User::delete(id, &conn) {
Ok(user) => Flash::success(
Redirect::to(route.base.path()),
format!("User {} was successfully deleted.", user.username),
@@ -70,7 +71,7 @@ implement_responder_for!(NewUserTemplate);
fn new(flash: Option<FlashMessage>) -> Page<NewUserTemplate> {
Page {
title: String::from("New user"),
- flash: flash,
+ flash,
content: NewUserTemplate {
user: Default::default(),
},
@@ -120,7 +121,7 @@ impl RegisterUserForm {
#[post("/create", data = "<user>")]
fn create(user: Form<RegisterUserForm>, route: &Route, conn: DbConn) -> Flash<Redirect> {
match user.get().new_user() {
- Ok(new_user) => match User::create(&new_user, conn) {
+ Ok(new_user) => match User::create(&new_user, &conn) {
Ok(_) => Flash::success(
Redirect::to(route.base.path()),
"User successfully created!",