Skip to content

Commit

Permalink
Merge branch 'release/v0.1.4'
Browse files Browse the repository at this point in the history
* release/v0.1.4:
  Bump version from 0.1.3 to 0.1.4
  fix: build errors
  Bump clap from 2.33.3 to 3.0.14
  Bump actions/checkout from 2.3.5 to 2.4.0
  Bump actions/checkout from 2.3.4 to 2.3.5
  Bump indicatif from 0.16.0 to 0.16.2
  Bump actions/checkout from 2 to 2.3.4
  • Loading branch information
MichaelSasser committed Feb 8, 2022
2 parents 882b125 + 100bc80 commit 176ced0
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0
- name: Build
run: cargo build --verbose
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0

- name: Build Release version
run: cargo build --release --verbose
Expand Down
140 changes: 89 additions & 51 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "wordlist-dedup"
version = "0.1.3"
version = "0.1.4"
authors = ["Michael Sasser <Michael@MichaelSasser.org>"]
edition = "2018"
edition = "2021"
license = "GPL-3.0+"
keywords = ["deduplication", "wordlist"]
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
indicatif = "0.16.0"
clap = "2.33.3"
indicatif = "0.16.2"
clap = { version = "3.0.14", features = ["cargo"] }
8 changes: 4 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use clap::{crate_version, App, Arg};
use clap::{crate_name, crate_version, App, Arg};
use indicatif::{ProgressBar, ProgressStyle};
use std::ffi::OsStr;
use std::fs::File;
Expand All @@ -18,17 +18,17 @@ fn remove_extension_from_filename(filename: &str) -> Option<&str> {
}

fn main() -> std::io::Result<()> {
let matches = App::new("wordlist-dedup")
let matches = App::new(crate_name!())
.version(crate_version!())
.author("Michael Sasser <Michael@MichaelSasser.org>")
.about("Deduplicate presorted wordlists.")
.arg(
Arg::with_name("SRC")
Arg::new("SRC")
.required(true)
.help("The presorted source file, wich may contains duplicated lines"),
)
.arg(
Arg::with_name("DEST")
Arg::new("DEST")
.required(false)
.help("The destination file, to write the deduplicated file to"),
)
Expand Down

0 comments on commit 176ced0

Please sign in to comment.