Skip to content

Commit 75d44c7

Browse files
committed
cmd(snip): fix snipoptions name
1 parent 19f61cf commit 75d44c7

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/command/mod.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,14 @@ pub enum Command {
7979
/// strategies besides classic username/password entry in legacy npm.
8080
auth_type: Option<String>,
8181
},
82-
<<<<<<< HEAD
8382

8483
#[structopt(name = "test")]
8584
/// 👩‍🔬 test your wasm!
8685
Test(TestOptions),
87-
||||||| merged common ancestors
88-
=======
8986

9087
#[structopt(name = "snip")]
9188
/// Replace a wasm function with an `unreachable`.
92-
Snip(SnipOpitons),
93-
>>>>>>> cmd(snip): rebase
89+
Snip(SnipOptions),
9490
}
9591

9692
/// Run a command with the given logger!

src/command/snip.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use parity_wasm::elements::{self, Serialize};
33
use wasm_snip;
44

55
#[derive(Clone, Debug, StructOpt)]
6-
pub struct SnipOpitons {
6+
pub struct SnipOptions {
77
input: String,
88
#[structopt(long = "output", short = "o")]
99
pub(crate) output: Option<String>,
@@ -16,7 +16,7 @@ pub struct SnipOpitons {
1616
snip_rust_panicking_code: bool,
1717
}
1818

19-
impl Into<wasm_snip::Options> for SnipOpitons {
19+
impl Into<wasm_snip::Options> for SnipOptions {
2020
fn into(self) -> wasm_snip::Options {
2121
wasm_snip::Options {
2222
input: ::std::path::PathBuf::from(self.input),
@@ -28,7 +28,7 @@ impl Into<wasm_snip::Options> for SnipOpitons {
2828
}
2929
}
3030

31-
pub(crate) fn snip(opts: SnipOpitons) -> Result<(), Error> {
31+
pub(crate) fn snip(opts: SnipOptions) -> Result<(), Error> {
3232
let module = wasm_snip::snip(opts.clone().into())?;
3333

3434
if let Some(output) = opts.output {

0 commit comments

Comments
 (0)