Skip to content

Commit 9bc7fe9

Browse files
committed
Fix use of str::len and deny in make validate-rust
Part of re-enabling clippy. Signed-off-by: Colin Walters <[email protected]>
1 parent ea360d6 commit 9bc7fe9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ test-tmt:
8787
# set of default rustc warnings.
8888
# We intentionally don't gate on this for local builds in cargo.toml
8989
# because it impedes iteration speed.
90-
CLIPPY_CONFIG = -A clippy::all -D clippy::correctness -D clippy::suspicious -Dunused_imports -Ddead_code
90+
CLIPPY_CONFIG = -A clippy::all -D clippy::correctness -D clippy::suspicious -D clippy::disallowed-methods -Dunused_imports -Ddead_code
9191
validate-rust:
9292
cargo fmt -- --check -l
9393
cargo test --no-run

crates/sysusers/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ impl SysusersEntry {
128128
fn next_token(s: &str) -> Option<(&str, &str)> {
129129
let s = s.trim_start();
130130
let (first, rest) = match s.strip_prefix('"') {
131-
None => {
132-
let idx = s.find(|c: char| c.is_whitespace()).unwrap_or(s.len());
133-
s.split_at(idx)
134-
}
131+
None => match s.find(|c: char| c.is_whitespace()) {
132+
Some(idx) => s.split_at(idx),
133+
None => (s, ""),
134+
},
135135
Some(rest) => {
136136
let end = rest.find('"')?;
137137
(&rest[..end], &rest[end + 1..])

0 commit comments

Comments
 (0)