git.delta.rocks / jrsonnet / refs/commits / 9efbcad25b9d

--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -18,11 +18,5 @@
 mimallocator = { version = "0.1.3", optional = true }
 thiserror = "1.0"
 gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" }
-
-[dependencies.clap]
-git = "https://github.com/clap-rs/clap"
-rev = "f0c5ea5e1503de5c8e74d8c047a799cf51498e83"
-
-[dependencies.clap_generate]
-git = "https://github.com/clap-rs/clap"
-rev = "f0c5ea5e1503de5c8e74d8c047a799cf51498e83"
+clap = { version = "3.1", features = ["derive"] }
+clap_complete = { version = "3.1" }

--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -1,4 +1,5 @@
-use clap::{AppSettings, Clap, IntoApp};
+use clap::{AppSettings, IntoApp, Parser};
+use clap_complete::Shell;
 use jrsonnet_cli::{ConfigureState, GcOpts, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};
 use jrsonnet_evaluator::{error::LocError, EvaluationState};
 use std::{
@@ -6,51 +7,39 @@
 	io::Read,
 	io::Write,
 	path::PathBuf,
-	str::FromStr,
 };
 
 #[cfg(feature = "mimalloc")]
 #[global_allocator]
 static GLOBAL: mimallocator::Mimalloc = mimallocator::Mimalloc;
 
-#[derive(Clap)]
-#[clap(help_heading = "DEBUG")]
+#[derive(Parser)]
+enum SubOpts {
+	/// Generate completions for specified shell
+	Generate {
+		/// Target shell name
+		shell: Shell,
+	},
+}
+
+#[derive(Parser)]
+#[clap(next_help_heading = "DEBUG")]
 struct DebugOpts {
 	/// Required OS stack size.
 	/// This shouldn't be changed unless jrsonnet is failing with stack overflow error.
 	#[clap(long, name = "size")]
 	pub os_stack: Option<usize>,
-	/// Generate completions script
-	#[clap(long)]
-	generate: Option<GenerateTarget>,
 }
 
-enum GenerateTarget {
-	Bash,
-	Zsh,
-	Fish,
-	PowerShell,
-}
-impl FromStr for GenerateTarget {
-	type Err = &'static str;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		match s {
-			"bash" => Ok(Self::Bash),
-			"zsh" => Ok(Self::Zsh),
-			"fish" => Ok(Self::Fish),
-			"powershell" => Ok(Self::PowerShell),
-			_ => Err("unknown target"),
-		}
-	}
-}
-
-#[derive(Clap)]
+#[derive(Parser)]
 #[clap(
-	global_setting = AppSettings::ColoredHelp,
 	global_setting = AppSettings::DeriveDisplayOrder,
+	// args_conflicts_with_subcommands = true,
 )]
 struct Opts {
+	#[clap(subcommand)]
+	sub: Option<SubOpts>,
+
 	#[clap(flatten)]
 	input: InputOpts,
 	#[clap(flatten)]
@@ -68,20 +57,17 @@
 fn main() {
 	let opts: Opts = Opts::parse();
 
-	if let Some(target) = opts.debug.generate {
-		use clap_generate::{generate, generators};
-		use GenerateTarget::*;
-		let app = &mut Opts::into_app();
-		let buf = &mut std::io::stdout();
-		let bin = "jrsonnet";
-		match target {
-			Bash => generate::<generators::Bash, _>(app, bin, buf),
-			Zsh => generate::<generators::Zsh, _>(app, bin, buf),
-			Fish => generate::<generators::Fish, _>(app, bin, buf),
-			PowerShell => generate::<generators::PowerShell, _>(app, bin, buf),
+	if let Some(sub) = opts.sub {
+		match sub {
+			SubOpts::Generate { shell } => {
+				use clap_complete::generate;
+				let app = &mut Opts::command();
+				let buf = &mut std::io::stdout();
+				generate(shell, app, "jrsonnet", buf);
+				std::process::exit(0)
+			}
 		}
-		std::process::exit(0);
-	};
+	}
 
 	let success = if let Some(size) = opts.debug.os_stack {
 		std::thread::Builder::new()

--- a/crates/jrsonnet-cli/Cargo.toml
+++ b/crates/jrsonnet-cli/Cargo.toml
@@ -14,6 +14,4 @@
 jrsonnet-parser = { path = "../../crates/jrsonnet-parser", version = "0.4.2" }
 gcmodule = { git = "https://github.com/CertainLach/gcmodule", branch = "jrsonnet" }
 
-[dependencies.clap]
-git = "https://github.com/clap-rs/clap"
-rev = "f0c5ea5e1503de5c8e74d8c047a799cf51498e83"
+clap = { version = "3.1", features = ["derive"] }

--- a/crates/jrsonnet-cli/src/ext.rs
+++ b/crates/jrsonnet-cli/src/ext.rs
@@ -1,5 +1,5 @@
 use crate::ConfigureState;
-use clap::Clap;
+use clap::Parser;
 use jrsonnet_evaluator::{error::Result, EvaluationState};
 use std::{fs::read_to_string, str::FromStr};
 
@@ -53,8 +53,8 @@
 	}
 }
 
-#[derive(Clap)]
-#[clap(help_heading = "EXTERNAL VARIABLES")]
+#[derive(Parser)]
+#[clap(next_help_heading = "EXTERNAL VARIABLES")]
 pub struct ExtVarOpts {
 	/// Add string external variable.
 	/// External variables are globally available so it is preferred

8pub use tla::*;8pub use tla::*;
9pub use trace::*;9pub use trace::*;
1010
11use clap::Clap;11use clap::Parser;
12use jrsonnet_evaluator::{error::Result, EvaluationState, FileImportResolver};12use jrsonnet_evaluator::{error::Result, EvaluationState, FileImportResolver};
13use std::{env, path::PathBuf};13use std::{env, path::PathBuf};
1414
15pub trait ConfigureState {15pub trait ConfigureState {
16	fn configure(&self, state: &EvaluationState) -> Result<()>;16	fn configure(&self, state: &EvaluationState) -> Result<()>;
17}17}
1818
19#[derive(Clap)]19#[derive(Parser)]
20#[clap(help_heading = "INPUT")]20#[clap(next_help_heading = "INPUT")]
21pub struct InputOpts {21pub struct InputOpts {
22	/// Treat input as code, evaluate them instead of reading file
22	#[clap(23	#[clap(long, short = 'e')]
23		long,
24		short = 'e',
25		about = "Treat input as code, evaluate them instead of reading file"
26	)]
27	pub exec: bool,24	pub exec: bool,
2825
29	#[clap(26	/// Path to the file to be compiled if `--evaluate` is unset, otherwise code itself
30		about = "Path to the file to be compiled if `--evaluate` is unset, otherwise code itself"
31	)]
32	pub input: String,27	pub input: String,
33}28}
3429
35#[derive(Clap)]30#[derive(Parser)]
36#[clap(help_heading = "OPTIONS")]31#[clap(next_help_heading = "OPTIONS")]
37pub struct MiscOpts {32pub struct MiscOpts {
38	/// Disable standard library.33	/// Disable standard library.
39	/// By default standard library will be available via global `std` variable.34	/// By default standard library will be available via global `std` variable.
74}69}
7570
76/// General configuration of jsonnet71/// General configuration of jsonnet
77#[derive(Clap)]72#[derive(Parser)]
78#[clap(name = "jrsonnet", version, author)]73#[clap(name = "jrsonnet", version, author)]
79pub struct GeneralOpts {74pub struct GeneralOpts {
80	#[clap(flatten)]75	#[clap(flatten)]
100	}95	}
101}96}
10297
103#[derive(Clap)]98#[derive(Parser)]
104#[clap(help_heading = "GARBAGE COLLECTION")]99#[clap(next_help_heading = "GARBAGE COLLECTION")]
105pub struct GcOpts {100pub struct GcOpts {
106	/// Do not skip gc on exit101	/// Do not skip gc on exit
107	#[clap(long)]102	#[clap(long)]

--- a/crates/jrsonnet-cli/src/manifest.rs
+++ b/crates/jrsonnet-cli/src/manifest.rs
@@ -1,5 +1,5 @@
 use crate::ConfigureState;
-use clap::Clap;
+use clap::Parser;
 use jrsonnet_evaluator::{error::Result, EvaluationState, ManifestFormat};
 use std::{path::PathBuf, str::FromStr};
 
@@ -22,8 +22,8 @@
 	}
 }
 
-#[derive(Clap)]
-#[clap(help_heading = "MANIFESTIFICATION OUTPUT")]
+#[derive(Parser)]
+#[clap(next_help_heading = "MANIFESTIFICATION OUTPUT")]
 pub struct ManifestOpts {
 	/// Output format, wraps resulting value to corresponding std.manifest call.
 	/// If set to `string` then plain string value is expected to be returned,
@@ -66,7 +66,7 @@
 	}
 }
 
-#[derive(Clap)]
+#[derive(Parser)]
 pub struct OutputOpts {
 	/// Write to the output file rather than stdout
 	#[clap(long, short = 'o')]

--- a/crates/jrsonnet-cli/src/tla.rs
+++ b/crates/jrsonnet-cli/src/tla.rs
@@ -1,9 +1,9 @@
 use crate::{ConfigureState, ExtFile, ExtStr};
-use clap::Clap;
+use clap::Parser;
 use jrsonnet_evaluator::{error::Result, EvaluationState};
 
-#[derive(Clap)]
-#[clap(help_heading = "TOP LEVEL ARGUMENTS")]
+#[derive(Parser)]
+#[clap(next_help_heading = "TOP LEVEL ARGUMENTS")]
 pub struct TLAOpts {
 	/// Add top level string argument.
 	/// Top level arguments will be passed to function before manifestification stage.

--- a/crates/jrsonnet-cli/src/trace.rs
+++ b/crates/jrsonnet-cli/src/trace.rs
@@ -1,5 +1,5 @@
 use crate::ConfigureState;
-use clap::Clap;
+use clap::Parser;
 use jrsonnet_evaluator::{
 	error::Result,
 	trace::{CompactFormat, ExplainingFormat, PathResolver},
@@ -24,8 +24,8 @@
 	}
 }
 
-#[derive(Clap)]
-#[clap(help_heading = "STACK TRACE VISUAL")]
+#[derive(Parser)]
+#[clap(next_help_heading = "STACK TRACE VISUAL")]
 pub struct TraceOpts {
 	/// Format of stack traces' display in console.
 	/// `compact` format only shows `filename:line:column`s