chore: bump up clap version

.github/workflows/ci.yaml

@@ -21,7 +21,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.58.1
+          toolchain: 1.67.1
           override: true
           components: rustfmt
       - name: Run
@@ -35,7 +35,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.58.1
+          toolchain: 1.67.1
           override: true
           components: clippy
       - name: Run
@@ -50,7 +50,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.56.1 # MSRV
+          toolchain: 1.67.1 # MSRV
           override: true
       - name: Run
         run: make ci-msrv
@@ -64,7 +64,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.58.1
+          toolchain: 1.67.1
           override: true
       - name: Run
         run: make ci-crates
@@ -78,7 +78,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.58.1
+          toolchain: 1.67.1
           override: true
       - name: Run
         run: make ci-examples

tools/compiler/Cargo.toml

@@ -28,7 +28,7 @@ name = "moleculec-rust"
 path = "src/compiler-rust.rs"
 
 [dependencies]
-clap = { version = "3", features = ["yaml", "cargo"] }
+clap = { version = "4", features = ["cargo", "string"] }
 which = "4.0.2"
 molecule-codegen = { version = "=0.7.5", path = "../codegen", features = ["compiler-plugin"] }
 

tools/compiler/src/compiler.rs

@@ -1,4 +1,3 @@
-#[macro_use]
 extern crate clap;
 
 use std::{convert::TryFrom, process, str};
@@ -21,17 +20,55 @@ pub(crate) mod config {
     }
 
     pub(crate) fn build_commandline() -> AppConfig {
-        let yaml = clap::load_yaml!("cli/compiler.yaml");
-        let matches = clap::App::from_yaml(yaml)
+        //let yaml = clap::load_yaml!("cli/compiler.yaml");
+        let matches = clap::Command::new("Moleculec")
             .version(clap::crate_version!())
+            .about("Schema compiler for molecule.")
+            .author("Nervos Core Dev <[email protected]>")
+            .arg(
+                clap::Arg::new("schema-file")
+                    .long("schema-file")
+                    .num_args(1)
+                    .help("Provide a schema file to compile.")
+                    .required(true)
+            )
+            .arg(
+                clap::Arg::new("language")
+                    .long("language")
+                    .help("Specify a language, then generate source code for the specified language and output the generated code to the stdout.
+                    This parameter actually specifies a plugin to use. It should be a simple word, and the compiler will search for a plugin called \"moleculec-<language>\" in `$PATH`.
+                    If \"<language>\" is \"-\", the compiler will dump the intermediate data of schema to standard output.")
+                    .required(true)
+            )
+            .arg(
+                 clap::Arg::new("format")
+                     .long("format")
+                     .help("If \"<language>\" is \"-\", this parameter is used to specify a format for the intermediate data.")
+                     .value_parser(
+                         [
+                             clap::builder::PossibleValue::new("json"),
+                             clap::builder::PossibleValue::new("yaml"),
+                         ]
+                     )
+            )
             .get_matches();
-        AppConfig::from(&matches)
+        AppConfig::from(matches)
     }
 
-    impl<'a> From<&'a clap::ArgMatches> for AppConfig {
-        fn from(matches: &'a clap::ArgMatches) -> Self {
-            let schema_file = value_t_or_exit!(matches, "schema-file", PathBuf);
-            let language = value_t_or_exit!(matches, "language", String);
+    impl From<clap::ArgMatches> for AppConfig {
+        fn from(matches: clap::ArgMatches) -> Self {
+            let schema_file = matches
+                .get_one::<PathBuf>("schema-file")
+                .unwrap_or_else(|| {
+                    eprintln!("Error: failed to get schema-file from command line args");
+                    process::exit(1);
+                });
+
+            let language = matches.get_one::<String>("language").unwrap_or_else(|| {
+                eprintln!("Error: failed to get language from command line args");
+                process::exit(1);
+            });
+
             if !schema_file.as_path().is_file() {
                 eprintln!(
                     "Error: schema-file [{}] should be a file",
@@ -40,7 +77,7 @@ pub(crate) mod config {
                 process::exit(1);
             }
             let output_config = if language == "-" {
-                let format = value_t!(matches, "format", String).unwrap_or_else(|_| {
+                let format = matches.get_one::<String>("format").unwrap_or_else(|| {
                     eprintln!("Error: since language is \"-\", a format is required");
                     process::exit(1);
                 });
@@ -52,7 +89,7 @@ pub(crate) mod config {
                     }
                 }
             } else {
-                if value_t!(matches, "format", String).is_ok() {
+                if matches.get_one::<String>("format").is_none() {
                     eprintln!("Error: since language is not \"-\", don't specify format");
                     process::exit(1);
                 }
@@ -65,7 +102,7 @@ pub(crate) mod config {
                 }
             };
             Self {
-                schema_file,
+                schema_file: schema_file.to_path_buf(),
                 output_config,
             }
         }

tools/compiler/src/lib.rs

@@ -16,22 +16,27 @@ pub struct AppConfig {
     format: IntermediateFormat,
 }
 
-type RawAppConfig<'a> = (Language, IntermediateFormat, &'a clap::ArgMatches);
+type RawAppConfig = (Language, IntermediateFormat, clap::ArgMatches);
 
 pub fn build_commandline(lang: Language, format: IntermediateFormat) -> AppConfig {
-    let yaml = clap::load_yaml!("cli/compiler-plugin.yaml");
-    let matches = clap::App::from_yaml(yaml)
-        .name(format!("Moleculec {} Plugin", lang))
+    //let yaml = clap::load_yaml!("cli/compiler-plugin.yaml");
+    let matches = clap::Command::new(format!("Moleculec {} Plugin", lang))
+        .author("Nervos Core Dev <[email protected]>")
         .about("Compiler plugin for molecule to generate code.")
         .version(clap::crate_version!())
+        .arg(
+            clap::Arg::new("format")
+                .long("format")
+                .help("Output the supported format for the intermediate data."),
+        )
         .get_matches();
-    AppConfig::from(&(lang, format, &matches))
+    AppConfig::from((lang, format, matches))
 }
 
-impl<'a> From<&'a RawAppConfig<'a>> for AppConfig {
-    fn from(input: &'a RawAppConfig<'a>) -> Self {
+impl From<RawAppConfig> for AppConfig {
+    fn from(input: RawAppConfig) -> Self {
         let (lang, format, matches) = input;
-        let action = if matches.is_present("format") {
+        let action = if matches.get_flag("format") {
             AppAction::DisplayFormat
         } else {
             let mut input = Vec::new();
@@ -43,8 +48,8 @@ impl<'a> From<&'a RawAppConfig<'a>> for AppConfig {
         };
         Self {
             action,
-            lang: *lang,
-            format: *format,
+            lang,
+            format,
         }
     }
 }