Merge pull request #5 from jnises/clap

1.4.9

Author: jnises

.github/workflows/release.yml

@@ -7,10 +7,10 @@ on:
 
 jobs:
   win_build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/bin/
@@ -27,16 +27,16 @@ jobs:
         run: |
           cargo build --release
           mv target/release/git-suggest-reviewers.exe git-suggest-reviewers_win_x64.exe
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: git-suggest-reviewers_win_x64.exe
           path: git-suggest-reviewers_win_x64.exe
 
   mac_build:
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/bin/
@@ -56,17 +56,18 @@ jobs:
           ARTIFACT="target/x86_64-apple-darwin/release/git-suggest-reviewers"
           strip -S "$ARTIFACT"
           ditto -c -k --sequesterRsrc "$ARTIFACT" git-suggest-reviewers_mac_x64.zip
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: git-suggest-reviewers_mac_x64.zip
           path: git-suggest-reviewers_mac_x64.zip
       - name: Build aarch64
+        # getting sdk using xcrun to cross compile. is this still needed these days?
         run: |
-          SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) cargo build --release --target aarch64-apple-darwin
+          SDKROOT=$(xcrun -sdk macosx12.3 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) cargo build --release --target aarch64-apple-darwin
           ARTIFACT="target/aarch64-apple-darwin/release/git-suggest-reviewers"
           strip -S "$ARTIFACT"
           ditto -c -k --sequesterRsrc "$ARTIFACT" git-suggest-reviewers_mac_aarch64.zip
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: git-suggest-reviewers_mac_aarch64.zip
           path: git-suggest-reviewers_mac_aarch64.zip          
@@ -75,13 +76,13 @@ jobs:
     needs: [win_build, mac_build]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: git-suggest-reviewers_mac_x64.zip
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: git-suggest-reviewers_mac_aarch64.zip        
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: git-suggest-reviewers_win_x64.exe
       # zip the win build here.

.github/workflows/test.yml

@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v2
+    - uses: actions/checkout@v3
+    - uses: actions/cache@v3
       with:
         path: |
           ~/.cargo/bin/

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "git-suggest-reviewers"
-version = "1.4.8"
+version = "1.4.9"
 authors = ["Joel Nises <[email protected]>"]
 edition = "2021"
 
@@ -9,7 +9,7 @@ lto = true
 
 [dependencies]
 anyhow = "1.0"
-structopt = "0.3"
+clap = { version = "4.0", features = ["derive"] }
 log = "0.4"
 stderrlog = "0.5"
 indicatif = "0.17"

Cargo.toml

@@ -1,16 +1,18 @@
 // #![warn(missing_debug_implementations, rust_2018_idoms, clippy:all)]
 use anyhow::{Context, Result};
+use clap::Parser;
 use git2::{BlameOptions, Diff, DiffFindOptions, DiffOptions, FileMode, Oid, Patch, Repository};
 use indicatif::{ProgressBar, ProgressStyle};
 use log::{debug, info, warn};
 use rayon::prelude::*;
 use std::{cell::RefCell, cmp, collections::HashMap};
-use structopt::StructOpt;
 use thread_local::ThreadLocal;
 
-#[derive(Debug, StructOpt)]
-#[structopt(
-    about = "List authors of lines changed by PR, including a few lines around the changed ones."
+#[derive(Debug, Parser)]
+#[command(
+    about = "List authors of lines changed by PR, including a few lines around the changed ones.",
+    author,
+    version
 )]
 struct Opt {
     /// Where to merge to
@@ -20,23 +22,23 @@ struct Opt {
     compare: String,
 
     /// Verbose mode (-v, -vv, -vvv, etc), disables progress bar
-    #[structopt(short, long, parse(from_occurrences))]
-    verbose: usize,
+    #[arg(short, long, action = clap::ArgAction::Count)]
+    verbose: u8,
 
     /// Don't display a progress bar
-    #[structopt(long)]
+    #[arg(long)]
     no_progress: bool,
 
     /// How many lines around each modification to count
-    #[structopt(long, default_value = "1")]
+    #[arg(long, default_value = "1")]
     context: u32,
 
     /// Try not to look further back than this commit when blaming files
-    #[structopt(long)]
+    #[arg(long)]
     stop_at: Option<String>,
 
     // Maximum number of threads. 0 is auto.
-    #[structopt(long, short = "j", default_value = "0")]
+    #[arg(long, short = 'j', default_value = "0")]
     max_concurrency: usize,
 }
 
@@ -59,8 +61,8 @@ fn get_diff(repo: &Repository, base: Oid, compare: Oid, context: u32) -> Result<
 }
 
 fn main() -> Result<()> {
-    let opt = Opt::from_args();
-    stderrlog::new().verbosity(opt.verbose).init()?;
+    let opt = Opt::parse();
+    stderrlog::new().verbosity(opt.verbose as usize).init()?;
     rayon::ThreadPoolBuilder::new()
         .num_threads(opt.max_concurrency)
         .build_global()?;