From 446308e1b3b1ba424778d409a9f15c262f7bb785 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Mon, 17 Oct 2022 21:15:40 +0000
Subject: [PATCH] fix: mark -S and --format as mutually exclusive


---
--- a/crates/jrsonnet-cli/src/manifest.rs
+++ b/crates/jrsonnet-cli/src/manifest.rs
@@ -28,13 +28,11 @@
 #[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,
-	/// otherwise output will be serialized to the specified format.
-	#[clap(long, short = 'f', default_value = "json", possible_values = &["string", "json", "yaml"])]
+	#[clap(long, short = 'f', default_value = "json", possible_values = &["json", "yaml"])]
 	format: ManifestFormatName,
 	/// Expect plain string as output.
-	/// Shortcut for `--format=string` thus this option is mutually exclusive with `format` option.
-	#[clap(long, short = 'S')]
+	/// Mutually exclusive with `--format`
+	#[clap(long, short = 'S', conflicts_with = "format")]
 	string: bool,
 	/// Write output as YAML stream, can be used with --format json/yaml
 	#[clap(long, short = 'y')]

-- 
gitstuff