Remove some unused #[derive] (#473)

We used to need them, probably when we were using Tera.

Cargo.lock

@@ -1810,7 +1810,6 @@ dependencies = [
  "ructe 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "scheduled-thread-pool 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_qs 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "validator 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1892,7 +1891,6 @@ dependencies = [
  "rocket 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "scheduled-thread-pool 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "tantivy 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -26,7 +26,6 @@ rocket_i18n = "0.4.0"
 rpassword = "2.0"
 scheduled-thread-pool = "0.2.0"
 serde = "1.0"
-serde_derive = "1.0"
 serde_json = "1.0"
 serde_qs = "0.4"
 validator = "0.8"

plume-common/src/activity_pub/mod.rs

@@ -1,4 +1,4 @@
-use activitypub::{Activity, Actor, Link, Object};
+use activitypub::{Activity, Link, Object};
 use array_tool::vec::Uniq;
 use reqwest::Client;
 use rocket::{
@@ -106,7 +106,7 @@ impl<'a, 'r> FromRequest<'a, 'r> for ApRequest {
             .unwrap_or(Outcome::Forward(()))
     }
 }
-pub fn broadcast<S: sign::Signer, A: Activity, T: inbox::WithInbox + Actor>(
+pub fn broadcast<S: sign::Signer, A: Activity, T: inbox::WithInbox>(
     sender: &S,
     act: A,
     to: Vec<T>,

plume-models/Cargo.toml

@@ -18,7 +18,6 @@ rocket = "0.4.0"
 reqwest = "0.9"
 scheduled-thread-pool = "0.2.0"
 serde = "1.0"
-serde_derive = "1.0"
 serde_json = "1.0"
 tantivy = "0.8.2"
 url = "1.7"

plume-models/src/blogs.rs

@@ -1,4 +1,4 @@
-use activitypub::{actor::Group, collection::OrderedCollection, Actor, CustomObject, Object};
+use activitypub::{actor::Group, collection::OrderedCollection, CustomObject};
 use chrono::NaiveDateTime;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
 use openssl::{
@@ -30,7 +30,7 @@ use {Connection, BASE_URL, USE_HTTPS, Error, Result};
 
 pub type CustomGroup = CustomObject<ApSignature, Group>;
 
-#[derive(Queryable, Identifiable, Serialize, Deserialize, Clone, AsChangeset)]
+#[derive(Queryable, Identifiable, Clone, AsChangeset)]
 pub struct Blog {
     pub id: i32,
     pub actor_id: String,
@@ -363,9 +363,6 @@ impl IntoId for Blog {
     }
 }
 
-impl Object for Blog {}
-impl Actor for Blog {}
-
 impl WithInbox for Blog {
     fn get_inbox_url(&self) -> String {
         self.inbox_url.clone()

plume-models/src/comment_seers.rs

@@ -5,7 +5,7 @@ use schema::comment_seers;
 use users::User;
 use {Connection, Error, Result};
 
-#[derive(Queryable, Serialize, Clone)]
+#[derive(Queryable, Clone)]
 pub struct CommentSeers {
     pub id: i32,
     pub comment_id: i32,

plume-models/src/comments.rs

@@ -20,7 +20,7 @@ use schema::comments;
 use users::User;
 use {Connection, Error, Result};
 
-#[derive(Queryable, Identifiable, Serialize, Clone, AsChangeset)]
+#[derive(Queryable, Identifiable, Clone, AsChangeset)]
 pub struct Comment {
     pub id: i32,
     pub content: SafeString,

plume-models/src/follows.rs

@@ -1,7 +1,6 @@
 use activitypub::{
     activity::{Accept, Follow as FollowAct, Undo},
     actor::Person,
-    Actor,
 };
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
 
@@ -74,7 +73,7 @@ impl Follow {
 
     /// from -> The one sending the follow request
     /// target -> The target of the request, responding with Accept
-    pub fn accept_follow<A: Signer + IntoId + Clone, B: Clone + WithInbox + Actor + IntoId>(
+    pub fn accept_follow<A: Signer + IntoId + Clone, B: Clone + WithInbox + IntoId>(
         conn: &Connection,
         from: &B,
         target: &A,

plume-models/src/instance.rs

@@ -9,7 +9,7 @@ use schema::{instances, users};
 use users::User;
 use {Connection, Error, Result};
 
-#[derive(Clone, Identifiable, Queryable, Serialize)]
+#[derive(Clone, Identifiable, Queryable)]
 pub struct Instance {
     pub id: i32,
     pub public_domain: String,

plume-models/src/lib.rs

@@ -21,8 +21,6 @@ extern crate rocket;
 extern crate scheduled_thread_pool;
 extern crate serde;
 #[macro_use]
-extern crate serde_derive;
-#[macro_use]
 extern crate serde_json;
 #[macro_use]
 extern crate tantivy;

plume-models/src/medias.rs

@@ -13,7 +13,7 @@ use schema::medias;
 use users::User;
 use {ap_url, Connection, Error, Result};
 
-#[derive(Clone, Identifiable, Queryable, Serialize)]
+#[derive(Clone, Identifiable, Queryable)]
 pub struct Media {
     pub id: i32,
     pub file_path: String,

plume-models/src/mentions.rs

@@ -9,7 +9,7 @@ use schema::mentions;
 use users::User;
 use {Connection, Error, Result};
 
-#[derive(Clone, Queryable, Identifiable, Serialize, Deserialize)]
+#[derive(Clone, Queryable, Identifiable)]
 pub struct Mention {
     pub id: i32,
     pub mentioned_id: i32,

plume-models/src/notifications.rs

@@ -19,7 +19,7 @@ pub mod notification_kind {
     pub const RESHARE: &str = "RESHARE";
 }
 
-#[derive(Clone, Queryable, Identifiable, Serialize)]
+#[derive(Clone, Queryable, Identifiable)]
 pub struct Notification {
     pub id: i32,
     pub user_id: i32,

plume-models/src/posts.rs

@@ -34,7 +34,7 @@ use {ap_url, Connection, BASE_URL, Error, Result, ApiResult};
 
 pub type LicensedArticle = CustomObject<Licensed, Article>;
 
-#[derive(Queryable, Identifiable, Serialize, Clone, AsChangeset)]
+#[derive(Queryable, Identifiable, Clone, AsChangeset)]
 #[changeset_options(treat_none_as_null = "true")]
 pub struct Post {
     pub id: i32,

plume-models/src/reshares.rs

@@ -12,7 +12,7 @@ use schema::reshares;
 use users::User;
 use {Connection, Error, Result};
 
-#[derive(Clone, Serialize, Deserialize, Queryable, Identifiable)]
+#[derive(Clone, Queryable, Identifiable)]
 pub struct Reshare {
     pub id: i32,
     pub user_id: i32,

plume-models/src/tags.rs

@@ -5,7 +5,7 @@ use plume_common::activity_pub::Hashtag;
 use schema::tags;
 use {ap_url, Connection, Error, Result};
 
-#[derive(Clone, Identifiable, Serialize, Queryable)]
+#[derive(Clone, Identifiable, Queryable)]
 pub struct Tag {
     pub id: i32,
     pub tag: String,

plume-models/src/users.rs

@@ -1,6 +1,6 @@
 use activitypub::{
-    actor::Person, collection::OrderedCollection, object::Image, Activity, Actor, CustomObject,
+    actor::Person, collection::OrderedCollection, object::Image, Activity, CustomObject,
-    Endpoint, Object,
+    Endpoint,
 };
 use bcrypt;
 use chrono::{NaiveDateTime, Utc};
@@ -44,7 +44,7 @@ use {ap_url, Connection, BASE_URL, USE_HTTPS, Error, Result};
 
 pub type CustomPerson = CustomObject<ApSignature, Person>;
 
-#[derive(Queryable, Identifiable, Serialize, Deserialize, Clone, Debug, AsChangeset)]
+#[derive(Queryable, Identifiable, Clone, Debug, AsChangeset)]
 pub struct User {
     pub id: i32,
     pub username: String,
@@ -829,8 +829,6 @@ impl IntoId for User {
 }
 
 impl Eq for User {}
-impl Object for User {}
-impl Actor for User {}
 
 impl WithInbox for User {
     fn get_inbox_url(&self) -> String {

src/main.rs

@@ -30,8 +30,6 @@ extern crate rocket_i18n;
 extern crate scheduled_thread_pool;
 extern crate serde;
 #[macro_use]
-extern crate serde_derive;
-#[macro_use]
 extern crate serde_json;
 extern crate serde_qs;
 extern crate validator;

src/routes/blogs.rs

@@ -66,7 +66,7 @@ pub fn new_auth(i18n: I18n) -> Flash<Redirect>{
     )
 }
 
-#[derive(Default, FromForm, Validate, Serialize)]
+#[derive(Default, FromForm, Validate)]
 pub struct NewBlogForm {
     #[validate(custom(function = "valid_slug", message = "Invalid name"))]
     pub title: String,

src/routes/comments.rs

@@ -25,7 +25,7 @@ use plume_models::{
 use Worker;
 use routes::errors::ErrorPage;
 
-#[derive(Default, FromForm, Debug, Validate, Serialize)]
+#[derive(Default, FromForm, Debug, Validate)]
 pub struct NewCommentForm {
     pub responding_to: Option<i32>,
     #[validate(length(min = "1", message = "Your comment can't be empty"))]

src/routes/instance.rs

@@ -103,7 +103,7 @@ pub fn admin(conn: DbConn, admin: Admin, intl: I18n) -> Result<Ructe, ErrorPage>
     )))
 }
 
-#[derive(Clone, FromForm, Validate, Serialize)]
+#[derive(Clone, FromForm, Validate)]
 pub struct InstanceSettingsForm {
     #[validate(length(min = "1"))]
     pub name: String,

src/routes/posts.rs

@@ -272,7 +272,7 @@ pub fn update(blog: String, slug: String, user: User, cl: ContentLen, form: Leni
     }
 }
 
-#[derive(Default, FromForm, Validate, Serialize)]
+#[derive(Default, FromForm, Validate)]
 pub struct NewPostForm {
     #[validate(custom(function = "valid_slug", message = "Invalid title"))]
     pub title: String,

src/routes/session.rs

@@ -29,7 +29,7 @@ pub fn new(user: Option<User>, conn: DbConn, m: Option<String>, intl: I18n) -> R
     ))
 }
 
-#[derive(Default, FromForm, Validate, Serialize)]
+#[derive(Default, FromForm, Validate)]
 pub struct LoginForm {
     #[validate(length(min = "1", message = "We need an email or a username to identify you"))]
     pub email_or_name: String,

src/routes/user.rs

@@ -276,7 +276,7 @@ pub fn delete(name: String, conn: DbConn, user: User, mut cookies: Cookies, sear
     }
 }
 
-#[derive(Default, FromForm, Serialize, Validate)]
+#[derive(Default, FromForm, Validate)]
 #[validate(
     schema(
         function = "passwords_match",