Reorganize use statements

src/activity_pub/inbox.rs

@@ -8,15 +8,19 @@ use diesel::PgConnection;
 use failure::Error;
 use serde_json;
 
-use activity_pub::{broadcast, Id, IntoId};
-use activity_pub::actor::Actor as APActor;
-use activity_pub::sign::*;
-use models::blogs::Blog;
-use models::comments::*;
-use models::follows;
-use models::likes;
-use models::posts::*;
-use models::users::User;
+use activity_pub::{
+    broadcast, Id, IntoId,
+    actor::Actor as APActor,
+    sign::*
+};
+use models::{
+    blogs::Blog,
+    comments::*,
+    follows,
+    likes,
+    posts::*,
+    users::User
+};
 
 #[derive(Fail, Debug)]
 enum InboxError {

src/activity_pub/mod.rs

@@ -2,9 +2,11 @@ use activitystreams_traits::{Activity, Actor, Object, Link};
 use array_tool::vec::Uniq;
 use diesel::PgConnection;
 use reqwest::Client;
-use rocket::http::{ContentType, Status};
-use rocket::response::{Response, Responder, Content};
-use rocket::request::Request;
+use rocket::{
+    http::{ContentType, Status},
+    response::{Response, Responder, Content},
+    request::Request
+};
 use rocket_contrib::Json;
 use serde_json;
 

src/activity_pub/object.rs

@@ -6,4 +6,3 @@ pub trait Object {
 
     fn compute_id(&self, conn: &PgConnection) -> String;
 }
-

src/activity_pub/request.rs

@@ -27,11 +27,8 @@ pub fn signature<S: Signer>(signer: &S, headers: Headers, conn: &PgConnection) -
     let signed_string = headers.iter().map(|h| format!("{}: {}", h.name().to_lowercase(), h.value_string())).collect::<Vec<String>>().join("\n");
     let signed_headers = headers.iter().map(|h| h.name().to_string()).collect::<Vec<String>>().join(" ").to_lowercase();
     
-    println!("Signing {}", signed_string);
-    println!("signed header {}", signed_headers);
     let data = signer.sign(signed_string);
     let sign = base64::encode(&data[..]);
-    println!("sigature {}", sign);
 
     Signature(format!(
         "keyId=\"{key_id}\",algorithm=\"rsa-sha256\",headers=\"{signed_headers}\",signature=\"{signature}\"",

src/activity_pub/sign.rs

@@ -1,10 +1,12 @@
 use base64;
+use chrono::Utc;
 use diesel::PgConnection;
 use hex;
-use chrono::Utc;
-use openssl::pkey::PKey;
-use openssl::rsa::Rsa;
-use openssl::sha::sha256;
+use openssl::{
+    pkey::PKey,
+    rsa::Rsa,
+    sha::sha256
+};
 use serde_json;
 
 /// Returns (public key, private key)

src/activity_pub/webfinger.rs

@@ -1,7 +1,9 @@
 use diesel::PgConnection;
 use reqwest::Client;
-use reqwest::header::{Accept, qitem};
-use reqwest::mime::Mime;
+use reqwest::{
+    header::{Accept, qitem},
+    mime::Mime
+};
 use serde_json;
 
 use activity_pub::ap_url;