Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump clap from 3.2.25 to 4.4.12 and MSRV from 1.60.0 to 1.70.0 #34

Closed
wants to merge 10 commits into from
Closed

Bump clap from 3.2.25 to 4.4.12 and MSRV from 1.60.0 to 1.70.0 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1d36319
Run 'cargo update' on sources
rustworthy Nov 30, 2023
6505ee5
Bump clap's major to 4
rustworthy Nov 30, 2023
13ff610
Adjust 'src/bin/loadtest.rs' to new clap API
rustworthy Nov 30, 2023
28d4d88
Use v3 of codecov-action
rustworthy Nov 30, 2023
721405f
Fix parsing number of jobs and threads
rustworthy Dec 1, 2023
6045614
Add 'openssl' as explicit dep, update test workflow for win
rustworthy Dec 11, 2023
8c63144
Set msrv to 1.70.0 (clippy@4 requirement)
rustworthy Dec 11, 2023
5094138
Merge branch 'main' into chore/update-deps
rustworthy Jan 3, 2024
76b1425
Rm duplicated openssl dep
rustworthy Jan 3, 2024
96475d5
Use strings[] for msrv matrix in 'check' workflow
rustworthy Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
# https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
strategy:
matrix:
msrv: ["1.60.0"]
msrv: ["1.70.0"]
name: ubuntu / ${{ matrix.msrv }}
steps:
- uses: actions/checkout@v4
Expand Down
143 changes: 70 additions & 73 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ chrono = { version = "0.4", features = ["serde", "clock"], default-features = fa
url = "2"
fnv = "1.0.5"
native-tls = { version = "0.2", optional = true }
clap = { version = "3.1.0", optional = true }
clap = { version = "4.4.10", optional = true }
thiserror = "1.0.30"
derive_builder = "0.12.0"

Expand Down
18 changes: 12 additions & 6 deletions src/bin/loadtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,26 @@
Arg::new("jobs")
.help("Number of jobs to run")
.index(1)
.default_value("30000")
.takes_value(true),
.default_value("30000"),

Check warning on line 20 in src/bin/loadtest.rs

View check run for this annotation

Codecov / codecov/patch

src/bin/loadtest.rs#L20 

Added line #L20 was not covered by tests
)
.arg(
Arg::new("threads")
.help("Number of consumers/producers to run")
.index(2)
.default_value("10")
.takes_value(true),
.default_value("10"),

Check warning on line 26 in src/bin/loadtest.rs

View check run for this annotation

Codecov / codecov/patch

src/bin/loadtest.rs#L26 

Added line #L26 was not covered by tests
)
.get_matches();

let jobs = matches.value_of_t_or_exit::<usize>("jobs");
let threads = matches.value_of_t_or_exit::<usize>("threads");
let jobs = matches
.get_one::<String>("jobs")
.unwrap()
.parse::<usize>()
.expect("Number of jobs to run");
let threads = matches
.get_one::<String>("threads")
.unwrap()
.parse::<usize>()
.expect("Number of consumers/producers to run");

Check warning on line 39 in src/bin/loadtest.rs

View check run for this annotation

Codecov / codecov/patch

src/bin/loadtest.rs#L30-L39 

Added lines #L30 - L39 were not covered by tests
println!(
"Running loadtest with {} jobs and {} threads",
jobs, threads
Expand Down
Loading