git.delta.rocks / jrsonnet / refs/commits / 8a2b9747ed0e

difftreelog

Merge pull request #18 from CertainLach/upgrade-clap

Yaroslav Bulyukin2020-10-19parents: #712f004 #88be4ee.patch.diff
in: master
Help headings and colors

9 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,8 +62,8 @@
 
 [[package]]
 name = "clap"
-version = "3.0.0-beta.1"
-source = "git+https://github.com/clap-rs/clap?rev=3e9ee86713b5c407b50ba76f30cffaed25952063#3e9ee86713b5c407b50ba76f30cffaed25952063"
+version = "3.0.0-beta.2"
+source = "git+https://github.com/clap-rs/clap?rev=1d0b21908f93478e75b4b1a21533d86325d39386#1d0b21908f93478e75b4b1a21533d86325d39386"
 dependencies = [
  "atty",
  "bitflags",
@@ -80,8 +80,8 @@
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0-beta.1"
-source = "git+https://github.com/clap-rs/clap?rev=3e9ee86713b5c407b50ba76f30cffaed25952063#3e9ee86713b5c407b50ba76f30cffaed25952063"
+version = "3.0.0-beta.2"
+source = "git+https://github.com/clap-rs/clap?rev=1d0b21908f93478e75b4b1a21533d86325d39386#1d0b21908f93478e75b4b1a21533d86325d39386"
 dependencies = [
  "heck",
  "proc-macro-error",
modifiedcmds/jrsonnet/Cargo.tomldiffbeforeafterboth
--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -23,4 +23,4 @@
 
 [dependencies.clap]
 git = "https://github.com/clap-rs/clap"
-rev = "3e9ee86713b5c407b50ba76f30cffaed25952063"
+rev = "1d0b21908f93478e75b4b1a21533d86325d39386"
modifiedcmds/jrsonnet/src/main.rsdiffbeforeafterboth
--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -1,3 +1,4 @@
+use clap::AppSettings;
 use clap::Clap;
 use jrsonnet_cli::{ConfigureState, GeneralOpts, InputOpts, ManifestOpts, OutputOpts};
 use jrsonnet_evaluator::{error::LocError, EvaluationState, ManifestFormat};
@@ -13,7 +14,7 @@
 static GLOBAL: mimallocator::Mimalloc = mimallocator::Mimalloc;
 
 #[derive(Clap)]
-// #[clap(help_heading = "DEBUG")]
+#[clap(help_heading = "DEBUG")]
 struct DebugOpts {
 	/// Required OS stack size.
 	/// This shouldn't be changed unless jrsonnet is failing with stack overflow error.
@@ -22,6 +23,10 @@
 }
 
 #[derive(Clap)]
+#[clap(
+	global_setting = AppSettings::ColoredHelp,
+	global_setting = AppSettings::DeriveDisplayOrder,
+)]
 struct Opts {
 	#[clap(flatten)]
 	input: InputOpts,
modifiedcrates/jrsonnet-cli/Cargo.tomldiffbeforeafterboth
--- a/crates/jrsonnet-cli/Cargo.toml
+++ b/crates/jrsonnet-cli/Cargo.toml
@@ -13,4 +13,4 @@
 
 [dependencies.clap]
 git = "https://github.com/clap-rs/clap"
-rev = "3e9ee86713b5c407b50ba76f30cffaed25952063"
+rev = "1d0b21908f93478e75b4b1a21533d86325d39386"
modifiedcrates/jrsonnet-cli/src/ext.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/ext.rs
+++ b/crates/jrsonnet-cli/src/ext.rs
@@ -54,7 +54,7 @@
 }
 
 #[derive(Clap)]
-// #[clap(help_heading = "EXTERNAL VARIABLES")]
+#[clap(help_heading = "EXTERNAL VARIABLES")]
 pub struct ExtVarOpts {
 	/// Add string external variable.
 	/// External variables are globally available so it is preferred
modifiedcrates/jrsonnet-cli/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/lib.rs
+++ b/crates/jrsonnet-cli/src/lib.rs
@@ -17,7 +17,7 @@
 }
 
 #[derive(Clap)]
-// #[clap(help_heading = "INPUT")]
+#[clap(help_heading = "INPUT")]
 pub struct InputOpts {
 	#[clap(
 		long,
@@ -33,7 +33,7 @@
 }
 
 #[derive(Clap)]
-// #[clap(help_heading = "OPTIONS")]
+#[clap(help_heading = "OPTIONS")]
 pub struct MiscOpts {
 	/// Disable standard library.
 	/// By default standard library will be available via global `std` variable.
modifiedcrates/jrsonnet-cli/src/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/manifest.rs
+++ b/crates/jrsonnet-cli/src/manifest.rs
@@ -23,8 +23,7 @@
 }
 
 #[derive(Clap)]
-// TODO: Restore arg group after issue fixed in clap
-// #[clap(group = clap::ArgGroup::new("output_format"), help_heading = "MANIFESTIFICATION OUTPUT")]
+#[clap(group = clap::ArgGroup::new("output_format"), 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,
@@ -33,7 +32,7 @@
 	format: ManifestFormatName,
 	/// Expect plain string as output.
 	/// Shortcut for `--format=string` thus this option is mutually exclusive with `format` option.
-	#[clap(long, short = 'S'/*, group = "output_format"*/)]
+	#[clap(long, short = 'S', group = "output_format")]
 	string: bool,
 	/// Write output as YAML stream, can be used with --format json/yaml
 	#[clap(long, short = 'y')]
modifiedcrates/jrsonnet-cli/src/tla.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/tla.rs
+++ b/crates/jrsonnet-cli/src/tla.rs
@@ -3,7 +3,7 @@
 use jrsonnet_evaluator::{error::Result, EvaluationState};
 
 #[derive(Clap)]
-// #[clap(help_heading = "TOP LEVEL ARGUMENTS")]
+#[clap(help_heading = "TOP LEVEL ARGUMENTS")]
 pub struct TLAOpts {
 	/// Add top level string argument.
 	/// Top level arguments will be passed to function before manifestification stage.
modifiedcrates/jrsonnet-cli/src/trace.rsdiffbeforeafterboth
before · crates/jrsonnet-cli/src/trace.rs
1use crate::ConfigureState;2use clap::Clap;3use jrsonnet_evaluator::{4	error::Result,5	trace::{CompactFormat, ExplainingFormat, PathResolver},6	EvaluationState,7};8use std::str::FromStr;910#[derive(PartialEq)]11pub enum TraceFormatName {12	Compact,13	Explaining,14}1516impl FromStr for TraceFormatName {17	type Err = &'static str;18	fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {19		Ok(match s {20			"compact" => TraceFormatName::Compact,21			"explaining" => TraceFormatName::Explaining,22			_ => return Err("no such format"),23		})24	}25}2627#[derive(Clap)]28// #[clap(help_heading = "STACK TRACE VISUAL")]29pub struct TraceOpts {30	/// Format of stack traces' display in console.31	/// `compact` format only shows `filename:line:column`s32	/// while `explaining` displays source code with attached trace annotations33	/// thus being more verbose.34	#[clap(long, possible_values = &["compact", "explaining"])]35	trace_format: Option<TraceFormatName>,36	/// Amount of stack trace elements to be displayed.37	/// If set to `0` then full stack trace will be displayed.38	#[clap(long, short = 't', default_value = "20")]39	max_trace: usize,40}41impl ConfigureState for TraceOpts {42	fn configure(&self, state: &EvaluationState) -> Result<()> {43		let resolver = PathResolver::Absolute;44		match self45			.trace_format46			.as_ref()47			.unwrap_or(&TraceFormatName::Compact)48		{49			TraceFormatName::Compact => state.set_trace_format(Box::new(CompactFormat {50				resolver,51				padding: 4,52			})),53			TraceFormatName::Explaining => {54				state.set_trace_format(Box::new(ExplainingFormat { resolver }))55			}56		}57		state.set_max_trace(self.max_trace);58		Ok(())59	}60}
after · crates/jrsonnet-cli/src/trace.rs
1use crate::ConfigureState;2use clap::Clap;3use jrsonnet_evaluator::{4	error::Result,5	trace::{CompactFormat, ExplainingFormat, PathResolver},6	EvaluationState,7};8use std::str::FromStr;910#[derive(PartialEq)]11pub enum TraceFormatName {12	Compact,13	Explaining,14}1516impl FromStr for TraceFormatName {17	type Err = &'static str;18	fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {19		Ok(match s {20			"compact" => TraceFormatName::Compact,21			"explaining" => TraceFormatName::Explaining,22			_ => return Err("no such format"),23		})24	}25}2627#[derive(Clap)]28#[clap(help_heading = "STACK TRACE VISUAL")]29pub struct TraceOpts {30	/// Format of stack traces' display in console.31	/// `compact` format only shows `filename:line:column`s32	/// while `explaining` displays source code with attached trace annotations33	/// thus being more verbose.34	#[clap(long, possible_values = &["compact", "explaining"])]35	trace_format: Option<TraceFormatName>,36	/// Amount of stack trace elements to be displayed.37	/// If set to `0` then full stack trace will be displayed.38	#[clap(long, short = 't', default_value = "20")]39	max_trace: usize,40}41impl ConfigureState for TraceOpts {42	fn configure(&self, state: &EvaluationState) -> Result<()> {43		let resolver = PathResolver::Absolute;44		match self45			.trace_format46			.as_ref()47			.unwrap_or(&TraceFormatName::Compact)48		{49			TraceFormatName::Compact => state.set_trace_format(Box::new(CompactFormat {50				resolver,51				padding: 4,52			})),53			TraceFormatName::Explaining => {54				state.set_trace_format(Box::new(ExplainingFormat { resolver }))55			}56		}57		state.set_max_trace(self.max_trace);58		Ok(())59	}60}