mirror of
https://github.com/dtolnay/cargo-expand.git
synced 2025-04-03 21:07:37 +03:00
Update to clap 3
This commit is contained in:
David Tolnay
parent
9a53dbb4e2
commit
865ae25b6e
6 changed files with 69 additions and 82 deletions
|
|
@ -1 +1 @@
|
|||
msrv = "1.44.0"
|
||||
msrv = "1.54.0"
|
||||
|
|
|
|||
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
|
@ -26,7 +26,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
rust: [nightly, beta, stable, 1.51.0]
|
||||
rust: [nightly, beta, stable, 1.54.0]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: dtolnay/rust-toolchain@master
|
||||
|
|
|
|||
77
Cargo.lock
generated
77
Cargo.lock
generated
|
|
@ -141,10 +141,10 @@ version = "1.0.10"
|
|||
dependencies = [
|
||||
"atty",
|
||||
"bat",
|
||||
"clap",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"serde",
|
||||
"structopt",
|
||||
"syn",
|
||||
"syn-select",
|
||||
"tempfile",
|
||||
|
|
@ -171,17 +171,30 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "2.34.0"
|
||||
version = "3.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
|
||||
checksum = "d17bf219fcd37199b9a29e00ba65dfb8cd5b2688b7297ec14ff829c40ac50ca9"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
"bitflags",
|
||||
"clap_derive",
|
||||
"indexmap",
|
||||
"lazy_static",
|
||||
"os_str_bytes",
|
||||
"strsim",
|
||||
"textwrap",
|
||||
"unicode-width",
|
||||
"vec_map",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "3.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e1b9752c030a14235a0bd5ef3ad60a1dcac8468c30921327fc8af36b20c790b9"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -512,6 +525,15 @@ dependencies = [
|
|||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "os_str_bytes"
|
||||
version = "6.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "path_abs"
|
||||
version = "0.5.1"
|
||||
|
|
@ -781,33 +803,9 @@ checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe"
|
|||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.8.0"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
|
||||
|
||||
[[package]]
|
||||
name = "structopt"
|
||||
version = "0.3.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"lazy_static",
|
||||
"structopt-derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "structopt-derive"
|
||||
version = "0.4.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
|
|
@ -896,12 +894,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.11.0"
|
||||
version = "0.14.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
|
||||
dependencies = [
|
||||
"unicode-width",
|
||||
]
|
||||
checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
|
|
@ -959,12 +954,6 @@ version = "0.2.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
|
||||
|
||||
[[package]]
|
||||
name = "vec_map"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
||||
|
||||
[[package]]
|
||||
name = "version_check"
|
||||
version = "0.9.4"
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ autotests = false
|
|||
|
||||
[dependencies]
|
||||
atty = "0.2"
|
||||
clap = { version = "3.0", default-features = false, features = ["derive", "std", "suggestions"] }
|
||||
proc-macro2 = "1.0"
|
||||
quote = { version = "1.0", default-features = false }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
structopt = "0.3"
|
||||
syn-select = "0.2"
|
||||
tempfile = "3.0"
|
||||
termcolor = "1.0"
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ use crate::opts::{Args, Coloring, Opts};
|
|||
use atty::Stream::{Stderr, Stdout};
|
||||
use bat::assets::HighlightingAssets;
|
||||
use bat::{PagingMode, PrettyPrinter};
|
||||
use clap::Parser;
|
||||
use quote::quote;
|
||||
use std::env;
|
||||
use std::ffi::OsString;
|
||||
|
|
@ -33,7 +34,6 @@ use std::io::{self, BufRead, Write};
|
|||
use std::path::{Path, PathBuf};
|
||||
use std::process::{self, Command, Stdio};
|
||||
use std::str::FromStr;
|
||||
use structopt::StructOpt;
|
||||
use termcolor::{Color::Green, ColorChoice, ColorSpec, StandardStream, WriteColor};
|
||||
|
||||
fn main() {
|
||||
|
|
@ -116,7 +116,7 @@ fn cargo_binary() -> OsString {
|
|||
}
|
||||
|
||||
fn cargo_expand() -> Result<i32> {
|
||||
let Opts::Expand(args) = Opts::from_args();
|
||||
let Opts::Expand(args) = Opts::parse();
|
||||
let config = config::deserialize();
|
||||
|
||||
if args.themes {
|
||||
|
|
|
|||
64
src/opts.rs
64
src/opts.rs
|
|
@ -1,124 +1,122 @@
|
|||
use clap::{AppSettings, Parser};
|
||||
use std::fmt::{self, Display};
|
||||
use std::path::PathBuf;
|
||||
use std::str::FromStr;
|
||||
use structopt::clap::AppSettings;
|
||||
use structopt::StructOpt;
|
||||
use syn_select::Selector;
|
||||
|
||||
#[derive(StructOpt)]
|
||||
#[structopt(bin_name = "cargo")]
|
||||
#[derive(Parser)]
|
||||
#[clap(bin_name = "cargo", version)]
|
||||
pub enum Opts {
|
||||
/// Show the result of macro expansion.
|
||||
#[structopt(
|
||||
#[clap(
|
||||
name = "expand",
|
||||
setting = AppSettings::UnifiedHelpMessage,
|
||||
version,
|
||||
setting = AppSettings::DeriveDisplayOrder,
|
||||
setting = AppSettings::DontCollapseArgsInUsage
|
||||
)]
|
||||
Expand(Args),
|
||||
}
|
||||
|
||||
#[derive(StructOpt, Debug)]
|
||||
#[structopt(rename_all = "kebab-case")]
|
||||
#[derive(Parser, Debug)]
|
||||
pub struct Args {
|
||||
/// Space-separated list of features to activate
|
||||
#[structopt(long, value_name = "FEATURES")]
|
||||
#[clap(long, value_name = "FEATURES")]
|
||||
pub features: Option<String>,
|
||||
|
||||
/// Activate all available features
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub all_features: bool,
|
||||
|
||||
/// Do not activate the `default` feature
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub no_default_features: bool,
|
||||
|
||||
/// Expand only this package's library
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub lib: bool,
|
||||
|
||||
/// Expand only the specified binary
|
||||
#[structopt(long, value_name = "NAME")]
|
||||
#[clap(long, value_name = "NAME")]
|
||||
pub bin: Option<String>,
|
||||
|
||||
/// Expand only the specified example
|
||||
#[structopt(long, value_name = "NAME")]
|
||||
#[clap(long, value_name = "NAME")]
|
||||
pub example: Option<String>,
|
||||
|
||||
/// Expand only the specified test target
|
||||
#[structopt(long, value_name = "NAME")]
|
||||
#[clap(long, value_name = "NAME")]
|
||||
pub test: Option<String>,
|
||||
|
||||
/// Include tests when expanding the lib or bin
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub tests: bool,
|
||||
|
||||
/// Expand only the specified bench target
|
||||
#[structopt(long, value_name = "NAME")]
|
||||
#[clap(long, value_name = "NAME")]
|
||||
pub bench: Option<String>,
|
||||
|
||||
/// Target triple which compiles will be for
|
||||
#[structopt(long, value_name = "TARGET")]
|
||||
#[clap(long, value_name = "TARGET")]
|
||||
pub target: Option<String>,
|
||||
|
||||
/// Directory for all generated artifacts
|
||||
#[structopt(long, value_name = "DIRECTORY", parse(from_os_str))]
|
||||
#[clap(long, value_name = "DIRECTORY", parse(from_os_str))]
|
||||
pub target_dir: Option<PathBuf>,
|
||||
|
||||
/// Path to Cargo.toml
|
||||
#[structopt(long, value_name = "PATH", parse(from_os_str))]
|
||||
#[clap(long, value_name = "PATH", parse(from_os_str))]
|
||||
pub manifest_path: Option<PathBuf>,
|
||||
|
||||
/// Package to expand
|
||||
#[structopt(short, long, value_name = "SPEC")]
|
||||
#[clap(short, long, value_name = "SPEC")]
|
||||
pub package: Option<String>,
|
||||
|
||||
/// Build artifacts in release mode, with optimizations
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub release: bool,
|
||||
|
||||
/// Number of parallel jobs, defaults to # of CPUs
|
||||
#[structopt(short, long, value_name = "N")]
|
||||
#[clap(short, long, value_name = "N")]
|
||||
pub jobs: Option<u64>,
|
||||
|
||||
/// Print command lines as they are executed
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub verbose: bool,
|
||||
|
||||
/// Coloring: auto, always, never
|
||||
#[structopt(long, value_name = "WHEN")]
|
||||
#[clap(long, value_name = "WHEN")]
|
||||
pub color: Option<Coloring>,
|
||||
|
||||
/// Require Cargo.lock and cache are up to date
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub frozen: bool,
|
||||
|
||||
/// Require Cargo.lock is up to date
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub locked: bool,
|
||||
|
||||
/// Run without accessing the network
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub offline: bool,
|
||||
|
||||
/// Unstable (nightly-only) flags to Cargo
|
||||
#[structopt(short = "Z", value_name = "FLAG")]
|
||||
#[clap(short = 'Z', value_name = "FLAG")]
|
||||
pub unstable_flags: Vec<String>,
|
||||
|
||||
/// Do not attempt to run rustfmt
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub ugly: bool,
|
||||
|
||||
/// Select syntax highlighting theme
|
||||
#[structopt(long, value_name = "NAME")]
|
||||
#[clap(long, value_name = "NAME")]
|
||||
pub theme: Option<String>,
|
||||
|
||||
/// Print available syntax highlighting theme names
|
||||
#[structopt(long)]
|
||||
#[clap(long)]
|
||||
pub themes: bool,
|
||||
|
||||
/// Local path to module or other named item to expand, e.g. os::unix::ffi
|
||||
#[structopt(value_name = "ITEM", parse(try_from_str = parse_selector))]
|
||||
#[clap(value_name = "ITEM", parse(try_from_str = parse_selector))]
|
||||
pub item: Option<Selector>,
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue