mirrors/cargo-expand
1
0
Fork 0
mirror of https://github.com/dtolnay/cargo-expand.git synced 2025-04-03 12:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Work around clap's bad default implementation of subcommand version

Browse source
This commit is contained in:
David Tolnay 2023-08-05 11:15:25 -07:00
parent 719643c943
commit 10fa612618
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main.rs
View file

@ -30,7 +30,7 @@ use crate::opts::Coloring::*;
use crate::opts::{Coloring, Expand, Subcommand};
use crate::unparse::unparse_maximal;
use bat::{PagingMode, PrettyPrinter};
use clap::{Parser, ValueEnum};
use clap::{CommandFactory, Parser, ValueEnum};
use quote::quote;
use std::env;
use std::ffi::OsString;
@ -62,6 +62,13 @@ fn cargo_binary() -> OsString {
fn cargo_expand() -> Result<i32> {
let Subcommand::Expand(args) = Subcommand::parse();
if args.version {
let mut stdout = io::stdout();
let _ = stdout.write_all(Subcommand::command().render_version().as_bytes());
return Ok(0);
}
let config = config::deserialize();
if args.themes {

6
src/opts.rs
View file

@ -9,7 +9,7 @@ const VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/version"));
#[command(bin_name = "cargo", version = VERSION, author, disable_help_subcommand = true)]
pub enum Subcommand {
/// Show the result of macro expansion.
#[command(name = "expand", version = VERSION, author)]
#[command(name = "expand", version = VERSION, author, disable_version_flag = true)]
Expand(Expand),
}
@ -118,6 +118,10 @@ pub struct Expand {
/// Local path to module or other named item to expand, e.g. os::unix::ffi
#[arg(value_name = "ITEM", value_parser = parse_selector)]
pub item: Option<Selector>,
/// Print version
#[arg(long)]
pub version: bool,
}
#[derive(ValueEnum, Debug, Clone, Copy)]