From ed19c269c45f81dc425c17cb14336c532f4b0ae1 Mon Sep 17 00:00:00 2001 From: Ambrose Chua Date: Sun, 4 Aug 2019 05:19:20 +0800 Subject: [PATCH] Run rustfmt --- src/main.rs | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index 6667322..6331af9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,9 @@ #![feature(proc_macro_hygiene, decl_macro)] -#[macro_use] extern crate rocket; -use rocket::State; +#[macro_use] +extern crate rocket; use rocket::response::content; +use rocket::State; use core::time::Duration; use futures::future::Future; @@ -11,8 +12,8 @@ use cuid::slug; use rusoto_core::region::Region; use rusoto_credential::{AwsCredentials, EnvironmentProvider, ProvideAwsCredentials}; -use rusoto_s3::PutObjectRequest; use rusoto_s3::util::{PreSignedRequest, PreSignedRequestOption}; +use rusoto_s3::PutObjectRequest; #[get("/")] fn index() -> content::Html<&'static str> { @@ -89,7 +90,10 @@ fn upload(api: State) -> String { } fn main() { - rocket::ignite().manage(Api::new()).mount("/", routes![index, upload]).launch(); + rocket::ignite() + .manage(Api::new()) + .mount("/", routes![index, upload]) + .launch(); } struct Api { @@ -128,10 +132,15 @@ impl Api { slug().unwrap() } fn read_region() -> String { - std::env::var("AWS_DEFAULT_REGION").or_else(|_| std::env::var("AWS_REGION")).map_err(|_| RegionError::new("No AWS_DEFAULT_REGION in environment")).unwrap() + std::env::var("AWS_DEFAULT_REGION") + .or_else(|_| std::env::var("AWS_REGION")) + .map_err(|_| RegionError::new("No AWS_DEFAULT_REGION in environment")) + .unwrap() } fn read_region_endpoint() -> String { - std::env::var("AWS_BASE_URL").map_err(|_| RegionError::new("No AWS_BASE_URL in environment")).unwrap() + std::env::var("AWS_BASE_URL") + .map_err(|_| RegionError::new("No AWS_BASE_URL in environment")) + .unwrap() } } @@ -141,7 +150,10 @@ struct RegionError { } impl RegionError { - pub fn new(message: S) -> Self where S: ToString { + pub fn new(message: S) -> Self + where + S: ToString, + { RegionError { message: message.to_string(), }