Skip to content

Commit 20ccf57

Browse files
committed
Upgrade all dependencies, get rid of structopt
[breaking change]: This requires Rust 1.60 to install, because of changes to Cargo's dependency management algorithm changes.
1 parent b982b0d commit 20ccf57

File tree

4 files changed

+101
-127
lines changed

4 files changed

+101
-127
lines changed

Cargo.lock

Lines changed: 74 additions & 100 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
name = "git-fixup"
33
version = "0.1.8"
44
authors = ["Brandon W Maister <[email protected]>"]
5-
edition = "2018"
5+
edition = "2021"
6+
default-run = "git-fixup"
67

78
[dependencies]
8-
anyhow = "1.0"
9-
clap = { version = "2.33", features = ["wrap_help"] }
10-
console = "0.11"
11-
dialoguer = "0.9.0"
12-
git2 = { version = "0.13.0", default_features = false }
13-
structopt = "0.3"
9+
anyhow = "1.0.58"
10+
clap = { version = "3.2.11", features = ["derive", "env", "wrap_help"] }
11+
console = "0.15.0"
12+
dialoguer = "0.10.1"
13+
git2 = { version = "0.14.4", default_features = false }
1414

1515
[dev-dependencies]
16-
assert_cmd = "1.0"
17-
assert_fs = "1.0"
18-
itertools = "*"
16+
assert_cmd = "2.0.4"
17+
assert_fs = "1.0.7"
18+
itertools = "0.10.3"

src/bin/git-rebase-with-intermediates.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
use structopt::StructOpt;
1+
use clap::Parser;
22

3-
#[derive(Debug, StructOpt)]
4-
#[structopt(
3+
#[derive(Parser, Debug)]
4+
#[clap(
55
about = "Perform a rebase, and pull all the branches that were pointing at commits being rebased",
66
max_term_width = 100,
7-
setting = structopt::clap::AppSettings::UnifiedHelpMessage,
8-
setting = structopt::clap::AppSettings::ColoredHelp,
7+
setting = clap::AppSettings::UnifiedHelpMessage,
8+
setting = clap::AppSettings::ColoredHelp,
99
)]
1010
struct Args {
1111
/// The target ref
1212
onto: String,
1313
}
1414

1515
fn main() {
16-
let args = Args::from_args();
16+
let args = Args::parse();
1717
if let Err(e) = git_fixup::rebase_onto(&args.onto) {
1818
eprintln!("{:#}", e);
1919
std::process::exit(1);

0 commit comments

Comments
 (0)