@@ -13,47 +13,47 @@ actor! {
1313 #[ derive( Debug ) ]
1414 pub struct Combiner {
1515 /// The name of the product, for display.
16- [ clap ( value_name = "NAME" ) ]
16+ [ arg ( value_name = "NAME" ) ]
1717 product_name: String = "Product" ,
1818
1919 /// The name of the package tarball.
20- [ clap ( value_name = "NAME" ) ]
20+ [ arg ( value_name = "NAME" ) ]
2121 package_name: String = "package" ,
2222
2323 /// The directory under lib/ where the manifest lives.
24- [ clap ( value_name = "DIR" ) ]
24+ [ arg ( value_name = "DIR" ) ]
2525 rel_manifest_dir: String = "packagelib" ,
2626
2727 /// The string to print after successful installation.
28- [ clap ( value_name = "MESSAGE" ) ]
28+ [ arg ( value_name = "MESSAGE" ) ]
2929 success_message: String = "Installed." ,
3030
3131 /// Places to look for legacy manifests to uninstall.
32- [ clap ( value_name = "DIRS" ) ]
32+ [ arg ( value_name = "DIRS" ) ]
3333 legacy_manifest_dirs: String = "" ,
3434
3535 /// Installers to combine.
36- [ clap ( value_name = "FILE,FILE" ) ]
36+ [ arg ( value_name = "FILE,FILE" ) ]
3737 input_tarballs: String = "" ,
3838
3939 /// Directory containing files that should not be installed.
40- [ clap ( value_name = "DIR" ) ]
40+ [ arg ( value_name = "DIR" ) ]
4141 non_installed_overlay: String = "" ,
4242
4343 /// The directory to do temporary work.
44- [ clap ( value_name = "DIR" ) ]
44+ [ arg ( value_name = "DIR" ) ]
4545 work_dir: String = "./workdir" ,
4646
4747 /// The location to put the final image and tarball.
48- [ clap ( value_name = "DIR" ) ]
48+ [ arg ( value_name = "DIR" ) ]
4949 output_dir: String = "./dist" ,
5050
5151 /// The profile used to compress the tarball.
52- [ clap ( value_name = "FORMAT" , default_value_t) ]
52+ [ arg ( value_name = "FORMAT" , default_value_t) ]
5353 compression_profile: CompressionProfile ,
5454
5555 /// The formats used to compress the tarball
56- [ clap ( value_name = "FORMAT" , default_value_t) ]
56+ [ arg ( value_name = "FORMAT" , default_value_t) ]
5757 compression_formats: CompressionFormats ,
5858 }
5959}
@@ -94,7 +94,7 @@ impl Combiner {
9494 let pkg_name =
9595 input_tarball. trim_end_matches ( & format ! ( ".tar.{}" , compression. extension( ) ) ) ;
9696 let pkg_name = Path :: new ( pkg_name) . file_name ( ) . unwrap ( ) ;
97- let pkg_dir = Path :: new ( & self . work_dir ) . join ( & pkg_name) ;
97+ let pkg_dir = Path :: new ( & self . work_dir ) . join ( pkg_name) ;
9898
9999 // Verify the version number.
100100 let mut version = String :: new ( ) ;
@@ -114,9 +114,9 @@ impl Combiner {
114114 // All we need to do is copy the component directory. We could
115115 // move it, but rustbuild wants to reuse the unpacked package
116116 // dir for OS-specific installers on macOS and Windows.
117- let component_dir = package_dir. join ( & component) ;
117+ let component_dir = package_dir. join ( component) ;
118118 create_dir ( & component_dir) ?;
119- copy_recursive ( & pkg_dir. join ( & component) , & component_dir) ?;
119+ copy_recursive ( & pkg_dir. join ( component) , & component_dir) ?;
120120
121121 // Merge the component name.
122122 writeln ! ( & components, "{}" , component) . context ( "failed to write new components" ) ?;
@@ -158,7 +158,7 @@ impl Combiner {
158158 . input ( self . package_name )
159159 . output ( path_to_str ( & output) ?. into ( ) )
160160 . compression_profile ( self . compression_profile )
161- . compression_formats ( self . compression_formats . clone ( ) ) ;
161+ . compression_formats ( self . compression_formats ) ;
162162 tarballer. run ( ) ?;
163163
164164 Ok ( ( ) )
0 commit comments