Skip to content

Commit 657c108

Browse files
committed
Use is_none_or in stdlib-module-shadowing
Summary -- This resolves a TODO I left behind in #16006 now that our MSRV is 1.83. Test Plan -- Existing tests
1 parent c892fee commit 657c108

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

crates/ruff_linter/src/rules/flake8_builtins/rules/stdlib_module_shadowing.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,7 @@ pub(crate) fn stdlib_module_shadowing(
120120
fn get_prefix<'a>(settings: &'a LinterSettings, path: &Path) -> Option<&'a PathBuf> {
121121
let mut prefix = None;
122122
for dir in settings.src.iter().chain([&settings.project_root]) {
123-
if path.starts_with(dir)
124-
// TODO `is_none_or` when MSRV >= 1.82
125-
&& (prefix.is_none() || prefix.is_some_and(|existing| existing < dir))
126-
{
123+
if path.starts_with(dir) && prefix.is_none_or(|existing| existing < dir) {
127124
prefix = Some(dir);
128125
}
129126
}

0 commit comments

Comments
 (0)