mirror of
https://git.joinplu.me/Plume/Plume.git
synced 2024-12-24 02:50:37 +00:00
Run cargo fmt
This commit is contained in:
parent
894c4fee2c
commit
4a4534d6f3
7 changed files with 7 additions and 7 deletions
|
@ -1,6 +1,5 @@
|
||||||
use activitypub::{Activity, Link, Object};
|
use activitypub::{Activity, Link, Object};
|
||||||
use array_tool::vec::Uniq;
|
use array_tool::vec::Uniq;
|
||||||
use tracing::{debug, warn};
|
|
||||||
use reqwest::r#async::ClientBuilder;
|
use reqwest::r#async::ClientBuilder;
|
||||||
use rocket::{
|
use rocket::{
|
||||||
http::Status,
|
http::Status,
|
||||||
|
@ -10,6 +9,7 @@ use rocket::{
|
||||||
};
|
};
|
||||||
use serde_json;
|
use serde_json;
|
||||||
use tokio::prelude::*;
|
use tokio::prelude::*;
|
||||||
|
use tracing::{debug, warn};
|
||||||
|
|
||||||
use self::sign::Signable;
|
use self::sign::Signable;
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
use crate::{Connection, Error, Result};
|
use crate::{Connection, Error, Result};
|
||||||
use diesel::connection::{Connection as Conn, SimpleConnection};
|
use diesel::connection::{Connection as Conn, SimpleConnection};
|
||||||
use tracing::info;
|
|
||||||
use migrations_internals::{setup_database, MigrationConnection};
|
use migrations_internals::{setup_database, MigrationConnection};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
use tracing::info;
|
||||||
|
|
||||||
#[allow(dead_code)] //variants might not be constructed if not required by current migrations
|
#[allow(dead_code)] //variants might not be constructed if not required by current migrations
|
||||||
enum Action {
|
enum Action {
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
use tracing::warn;
|
|
||||||
use plume_common::activity_pub::{
|
use plume_common::activity_pub::{
|
||||||
inbox::FromId,
|
inbox::FromId,
|
||||||
request::Digest,
|
request::Digest,
|
||||||
|
@ -11,6 +10,7 @@ use rocket::{data::*, http::Status, response::status, Outcome::*, Request};
|
||||||
use rocket_contrib::json::*;
|
use rocket_contrib::json::*;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
|
use tracing::warn;
|
||||||
|
|
||||||
pub fn handle_incoming(
|
pub fn handle_incoming(
|
||||||
rockets: PlumeRocket,
|
rockets: PlumeRocket,
|
||||||
|
|
|
@ -13,7 +13,6 @@ extern crate validator_derive;
|
||||||
use chrono::Utc;
|
use chrono::Utc;
|
||||||
use clap::App;
|
use clap::App;
|
||||||
use diesel::r2d2::ConnectionManager;
|
use diesel::r2d2::ConnectionManager;
|
||||||
use tracing::warn;
|
|
||||||
use plume_models::{
|
use plume_models::{
|
||||||
db_conn::{DbPool, PragmaForeignKey},
|
db_conn::{DbPool, PragmaForeignKey},
|
||||||
instance::Instance,
|
instance::Instance,
|
||||||
|
@ -28,6 +27,7 @@ use std::path::Path;
|
||||||
use std::process::exit;
|
use std::process::exit;
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
use tracing::warn;
|
||||||
|
|
||||||
init_i18n!(
|
init_i18n!(
|
||||||
"plume", af, ar, bg, ca, cs, cy, da, de, el, en, eo, es, fa, fi, fr, gl, he, hi, hr, hu, it,
|
"plume", af, ar, bg, ca, cs, cy, da, de, el, en, eo, es, fa, fi, fr, gl, he, hi, hr, hu, it,
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
use crate::template_utils::{IntoContext, Ructe};
|
use crate::template_utils::{IntoContext, Ructe};
|
||||||
use tracing::warn;
|
|
||||||
use plume_models::{Error, PlumeRocket};
|
use plume_models::{Error, PlumeRocket};
|
||||||
use rocket::{
|
use rocket::{
|
||||||
response::{self, Responder},
|
response::{self, Responder},
|
||||||
Request,
|
Request,
|
||||||
};
|
};
|
||||||
|
use tracing::warn;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct ErrorPage(Error);
|
pub struct ErrorPage(Error);
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
use crate::routes::RespondOrRedirect;
|
use crate::routes::RespondOrRedirect;
|
||||||
use lettre::Transport;
|
use lettre::Transport;
|
||||||
use tracing::warn;
|
|
||||||
use rocket::http::ext::IntoOwned;
|
use rocket::http::ext::IntoOwned;
|
||||||
use rocket::{
|
use rocket::{
|
||||||
http::{uri::Uri, Cookie, Cookies, SameSite},
|
http::{uri::Uri, Cookie, Cookies, SameSite},
|
||||||
|
@ -14,6 +13,7 @@ use std::{
|
||||||
sync::{Arc, Mutex},
|
sync::{Arc, Mutex},
|
||||||
time::Instant,
|
time::Instant,
|
||||||
};
|
};
|
||||||
|
use tracing::warn;
|
||||||
use validator::{Validate, ValidationError, ValidationErrors};
|
use validator::{Validate, ValidationError, ValidationErrors};
|
||||||
|
|
||||||
use crate::mail::{build_mail, Mailer};
|
use crate::mail::{build_mail, Mailer};
|
||||||
|
|
|
@ -3,7 +3,6 @@ use activitypub::{
|
||||||
collection::{OrderedCollection, OrderedCollectionPage},
|
collection::{OrderedCollection, OrderedCollectionPage},
|
||||||
};
|
};
|
||||||
use diesel::SaveChangesDsl;
|
use diesel::SaveChangesDsl;
|
||||||
use tracing::{info, warn};
|
|
||||||
use rocket::{
|
use rocket::{
|
||||||
http::{ContentType, Cookies},
|
http::{ContentType, Cookies},
|
||||||
request::LenientForm,
|
request::LenientForm,
|
||||||
|
@ -12,6 +11,7 @@ use rocket::{
|
||||||
use rocket_i18n::I18n;
|
use rocket_i18n::I18n;
|
||||||
use serde_json;
|
use serde_json;
|
||||||
use std::{borrow::Cow, collections::HashMap};
|
use std::{borrow::Cow, collections::HashMap};
|
||||||
|
use tracing::{info, warn};
|
||||||
use validator::{Validate, ValidationError, ValidationErrors};
|
use validator::{Validate, ValidationError, ValidationErrors};
|
||||||
|
|
||||||
use crate::inbox;
|
use crate::inbox;
|
||||||
|
|
Loading…
Reference in a new issue