RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

fix more clippy warnings

Browse source
This commit is contained in:
DevSabb 2022-03-28 11:09:26 -04:00
parent 16ad4bc069
commit 68b1f04f7d
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/uu/shuf/src/shuf.rs
View file

@ -7,7 +7,7 @@
// spell-checker:ignore (ToDO) cmdline evec seps rvec fdata // spell-checker:ignore (ToDO) cmdline evec seps rvec fdata
use clap::{crate_version, Arg, Command}; use clap::{crate_version, Arg, Command, Values};
use rand::prelude::SliceRandom; use rand::prelude::SliceRandom;
use rand::RngCore; use rand::RngCore;
use std::fs::File; use std::fs::File;
@ -76,11 +76,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let options = Options { let options = Options {
head_count: { head_count: {
let headcounts: Vec<&str> = matches let mut headcounts: Values<'_> =
.values_of(options::HEAD_COUNT) matches.values_of(options::HEAD_COUNT).unwrap_or_default();
.unwrap_or_default() match parse_head_count(&mut headcounts) {
.collect();
match parse_head_count(&headcounts) {
Ok(val) => val, Ok(val) => val,
Err(msg) => return Err(USimpleError::new(1, msg)), Err(msg) => return Err(USimpleError::new(1, msg)),
} }
@ -298,7 +296,7 @@ fn parse_range(input_range: &str) -> Result<(usize, usize), String> {
} }
} }
fn parse_head_count(headcounts: &[&str]) -> Result<usize, String> { fn parse_head_count(headcounts: &mut Values<'_>) -> Result<usize, String> {
let mut result = std::usize::MAX; let mut result = std::usize::MAX;
for count in headcounts { for count in headcounts {
match count.parse::<usize>() { match count.parse::<usize>() {

8
tests/by-util/test_shuf.rs
View file

@ -203,10 +203,10 @@ fn test_shuf_multiple_input_line_count() {
.args(&["-i10-200", "-n", "10", "-n", "5"]) .args(&["-i10-200", "-n", "10", "-n", "5"])
.succeeds(); .succeeds();
result.no_stderr(); result.no_stderr();
let result_seq: Vec<&str> = result
let result_seq = result
.stdout_str() .stdout_str()
.split('\n') .split('\n')
.filter(|x| !x.is_empty()) .filter(|x| !x.is_empty());
.collect(); assert_eq!(result_seq.count(), 5, "Output should have 5 items");
assert_eq!(result_seq.len(), 5, "Output should have 5 items");
} }