From 191f98f2147337a3048a91a37f70085d34c599d7 Mon Sep 17 00:00:00 2001 From: Eduardo Trujillo <ed@chromabits.com> Date: Tue, 15 Nov 2022 13:15:40 -0800 Subject: [PATCH] style(cli): Run cargo fmt --- src/cli/args.rs | 7 +++++-- src/cli/bundle.rs | 7 +++++-- src/cli/mod.rs | 2 +- src/cli/serve.rs | 35 +++++++++++++++++++---------------- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/cli/args.rs b/src/cli/args.rs index 4d1dba9..6960131 100644 --- a/src/cli/args.rs +++ b/src/cli/args.rs @@ -1,7 +1,10 @@ use std::path::PathBuf; use clap::{Parser, Subcommand}; -use collective::{cli::{AppOpts, ConfigurableAppOpts}, config::ConfigFileFormat}; +use collective::{ + cli::{AppOpts, ConfigurableAppOpts}, + config::ConfigFileFormat, +}; use espresso::config::Config; #[derive(Parser)] @@ -50,4 +53,4 @@ impl ConfigurableAppOpts<Config> for Opts { vec![] } } -} \ No newline at end of file +} diff --git a/src/cli/bundle.rs b/src/cli/bundle.rs index e7773f1..0ede3af 100644 --- a/src/cli/bundle.rs +++ b/src/cli/bundle.rs @@ -1,6 +1,9 @@ use std::sync::Arc; -use espresso::{config::Config, bundle::{Bundler, packager}}; +use espresso::{ + bundle::{packager, Bundler}, + config::Config, +}; use super::args::BundleOpts; @@ -10,4 +13,4 @@ pub async fn bundle(config: Arc<Config>, opts: BundleOpts) -> Result<(), package bundler.package(opts.source_path).await.unwrap(); Ok(()) -} \ No newline at end of file +} diff --git a/src/cli/mod.rs b/src/cli/mod.rs index f00b6dc..605e737 100644 --- a/src/cli/mod.rs +++ b/src/cli/mod.rs @@ -1,3 +1,3 @@ pub mod args; pub mod bundle; -pub mod serve; \ No newline at end of file +pub mod serve; diff --git a/src/cli/serve.rs b/src/cli/serve.rs index 47ab754..50911db 100644 --- a/src/cli/serve.rs +++ b/src/cli/serve.rs @@ -1,9 +1,20 @@ -use std::{sync::{Arc, mpsc}, collections::HashSet}; use actix::System; -use collective::thread::{monitor::{ThreadMonitor, self}, self}; -use espresso::{config::Config, bundle::{Unbundler, self}, server::{Server, self}, stats::{StatsServer, self}}; +use collective::thread::{ + self, + monitor::{self, ThreadMonitor}, +}; +use espresso::{ + bundle::{self, Unbundler}, + config::Config, + server::{self, Server}, + stats::{self, StatsServer}, +}; use lazy_static::lazy_static; -use snafu::{Snafu, ResultExt}; +use snafu::{ResultExt, Snafu}; +use std::{ + collections::HashSet, + sync::{mpsc, Arc}, +}; use tokio::sync::RwLock; lazy_static! { @@ -12,18 +23,10 @@ lazy_static! { #[derive(Snafu, Debug)] pub enum Error { - Unbundle { - source: bundle::Error, - }, - ServeError { - source: Box<server::Error>, - }, - ServeStats { - source: stats::Error, - }, - MonitorError { - source: monitor::Error, - }, + Unbundle { source: bundle::Error }, + ServeError { source: Box<server::Error> }, + ServeStats { source: stats::Error }, + MonitorError { source: monitor::Error }, RecvNotify, } -- GitLab