cmd(init/build): cargo clippy

master
csmoe 7 years ago
parent edbd6f4118
commit 0a616624aa
  1. 6
      src/command/build.rs
  2. 12
      src/command/mod.rs

@ -83,7 +83,7 @@ type BuildStep = fn(&mut Build, &Step, &Logger) -> Result<(), Error>;
impl Build { impl Build {
/// Execute this `Build` command. /// Execute this `Build` command.
pub fn run(&mut self, log: &Logger, mode: BuildMode) -> Result<(), Error> { pub fn run(&mut self, log: &Logger, mode: &BuildMode) -> Result<(), Error> {
let process_steps = Build::get_process_steps(mode); let process_steps = Build::get_process_steps(mode);
let mut step_counter = Step::new(process_steps.len()); let mut step_counter = Step::new(process_steps.len());
@ -112,7 +112,7 @@ impl Build {
Ok(()) Ok(())
} }
fn get_process_steps(mode: BuildMode) -> Vec<(&'static str, BuildStep)> { fn get_process_steps(mode: &BuildMode) -> Vec<(&'static str, BuildStep)> {
macro_rules! steps { macro_rules! steps {
($($name:ident),+) => { ($($name:ident),+) => {
{ {
@ -123,7 +123,7 @@ impl Build {
}; };
($($name:ident,)*) => (steps![$($name),*]) ($($name:ident,)*) => (steps![$($name),*])
} }
match mode { match &mode {
BuildMode::Normal => steps![ BuildMode::Normal => steps![
step_check_crate_config, step_check_crate_config,
step_add_wasm_target, step_add_wasm_target,

@ -7,8 +7,8 @@ mod pack;
mod publish; mod publish;
pub mod utils; pub mod utils;
use self::build::{Build, BuildMode}; use self::build::{Build, BuildMode, BuildOptions};
use self::init::Init; use self::init::{Init, InitOptions};
use self::login::login; use self::login::login;
use self::pack::pack; use self::pack::pack;
use self::publish::publish; use self::publish::publish;
@ -23,11 +23,11 @@ use PBAR;
pub enum Command { pub enum Command {
#[structopt(name = "init")] #[structopt(name = "init")]
/// 🐣 initialize a package.json based on your compiled wasm! /// 🐣 initialize a package.json based on your compiled wasm!
Init(init::InitOptions), Init(InitOptions),
/// build /// 🏗 build your npm package!
#[structopt(name = "build")] #[structopt(name = "build")]
Build(self::build::BuildOptions), Build(BuildOptions),
#[structopt(name = "pack")] #[structopt(name = "pack")]
/// 🍱 create a tar of your npm package but don't publish! /// 🍱 create a tar of your npm package but don't publish!
@ -94,7 +94,7 @@ pub fn run_wasm_pack(command: Command, log: &Logger) -> result::Result<(), Error
"normal" => BuildMode::Normal, "normal" => BuildMode::Normal,
_ => BuildMode::Normal, _ => BuildMode::Normal,
}; };
Build::from(build_opts).run(&log, build_mode) Build::from(build_opts).run(&log, &build_mode)
} }
Command::Pack { path } => { Command::Pack { path } => {
info!(&log, "Running pack command..."); info!(&log, "Running pack command...");

Loading…
Cancel
Save