File tree 2 files changed +4
-8
lines changed
2 files changed +4
-8
lines changed Original file line number Diff line number Diff line change @@ -79,18 +79,14 @@ pub enum Command {
79
79
/// strategies besides classic username/password entry in legacy npm.
80
80
auth_type : Option < String > ,
81
81
} ,
82
- <<<<<<< HEAD
83
82
84
83
#[ structopt( name = "test" ) ]
85
84
/// 👩🔬 test your wasm!
86
85
Test ( TestOptions ) ,
87
- ||||||| merged common ancestors
88
- =======
89
86
90
87
#[ structopt( name = "snip" ) ]
91
88
/// Replace a wasm function with an `unreachable`.
92
- Snip ( SnipOpitons ) ,
93
- >>>>>>> cmd( snip) : rebase
89
+ Snip ( SnipOptions ) ,
94
90
}
95
91
96
92
/// Run a command with the given logger!
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ use parity_wasm::elements::{self, Serialize};
3
3
use wasm_snip;
4
4
5
5
#[ derive( Clone , Debug , StructOpt ) ]
6
- pub struct SnipOpitons {
6
+ pub struct SnipOptions {
7
7
input : String ,
8
8
#[ structopt( long = "output" , short = "o" ) ]
9
9
pub ( crate ) output : Option < String > ,
@@ -16,7 +16,7 @@ pub struct SnipOpitons {
16
16
snip_rust_panicking_code : bool ,
17
17
}
18
18
19
- impl Into < wasm_snip:: Options > for SnipOpitons {
19
+ impl Into < wasm_snip:: Options > for SnipOptions {
20
20
fn into ( self ) -> wasm_snip:: Options {
21
21
wasm_snip:: Options {
22
22
input : :: std:: path:: PathBuf :: from ( self . input ) ,
@@ -28,7 +28,7 @@ impl Into<wasm_snip::Options> for SnipOpitons {
28
28
}
29
29
}
30
30
31
- pub ( crate ) fn snip ( opts : SnipOpitons ) -> Result < ( ) , Error > {
31
+ pub ( crate ) fn snip ( opts : SnipOptions ) -> Result < ( ) , Error > {
32
32
let module = wasm_snip:: snip ( opts. clone ( ) . into ( ) ) ?;
33
33
34
34
if let Some ( output) = opts. output {
You can’t perform that action at this time.
0 commit comments