diff --git a/crates/red_knot/src/ast_ids.rs b/crates/red_knot/src/ast_ids.rs index e456c8c95af862..a73a62beef5937 100644 --- a/crates/red_knot/src/ast_ids.rs +++ b/crates/red_knot/src/ast_ids.rs @@ -275,7 +275,7 @@ pub struct TypedNodeKey { impl TypedNodeKey { pub fn new(node_key: NodeKey) -> Option { - N::can_cast(node_key.kind).then(|| TypedNodeKey { + N::can_cast(node_key.kind).then_some(TypedNodeKey { inner: node_key, _marker: PhantomData, }) diff --git a/crates/red_knot/src/db.rs b/crates/red_knot/src/db.rs index 616d3966a47a22..eede7c884dc655 100644 --- a/crates/red_knot/src/db.rs +++ b/crates/red_knot/src/db.rs @@ -309,5 +309,5 @@ pub fn definitions(db: &dyn Db, source_text: SourceText) -> Arc { let ast = parsed.ast(db); let ids = ast_ids(db, source_text); - Arc::new(Definitions::from_module(ast, &*ids, source_text.file(db))) + Arc::new(Definitions::from_module(ast, &ids, source_text.file(db))) } diff --git a/crates/red_knot/src/hir/definition.rs b/crates/red_knot/src/hir/definition.rs index 83321ce725f2a5..35b239796ab98f 100644 --- a/crates/red_knot/src/hir/definition.rs +++ b/crates/red_knot/src/hir/definition.rs @@ -417,34 +417,28 @@ impl DefinitionsVisitor<'_> { fn lower_type_parameter(&mut self, type_parameter: &TypeParam) -> TypeParameterId { match type_parameter { TypeParam::TypeVar(type_var) => { - let id = self - .definitions + self.definitions .type_parameters .push(TypeParameter::TypeVar(TypeParameterTypeVar { name: Name::new(&type_var.name), ast_id: self.ast_id(type_var), - })); - id + })) } TypeParam::ParamSpec(param_spec) => { - let id = self - .definitions + self.definitions .type_parameters .push(TypeParameter::ParamSpec(TypeParameterParamSpec { name: Name::new(¶m_spec.name), ast_id: self.ast_id(param_spec), - })); - id + })) } TypeParam::TypeVarTuple(type_var_tuple) => { - let id = self - .definitions + self.definitions .type_parameters .push(TypeParameter::TypeVarTuple(TypeParameterTypeVarTuple { name: Name::new(&type_var_tuple.name), ast_id: self.ast_id(type_var_tuple), - })); - id + })) } } } @@ -546,17 +540,17 @@ impl PreorderVisitor<'_> for DefinitionsVisitor<'_> { fn visit_except_handler(&mut self, except_handler: &'_ ExceptHandler) { match except_handler { ExceptHandler::ExceptHandler(except_handler) => { - self.lower_except_handler(except_handler) + self.lower_except_handler(except_handler); } } } fn visit_with_item(&mut self, with_item: &'_ WithItem) { - self.lower_with_item(&with_item); + self.lower_with_item(with_item); } fn visit_match_case(&mut self, match_case: &'_ MatchCase) { - self.lower_match_case(&match_case); + self.lower_match_case(match_case); self.visit_body(&match_case.body); } } diff --git a/crates/red_knot/src/module.rs b/crates/red_knot/src/module.rs index dc805c85d4b822..8dc5805f702c48 100644 --- a/crates/red_knot/src/module.rs +++ b/crates/red_knot/src/module.rs @@ -53,7 +53,7 @@ impl ModuleName { Some(Self(name)) } - pub fn components(&self) -> impl Iterator + DoubleEndedIterator { + pub fn components(&self) -> impl DoubleEndedIterator { self.0.split('.') } @@ -208,7 +208,7 @@ impl ModuleResolver { /// Returns the module for a given id. pub fn module(&self, id: ModuleId) -> &Module { - self.modules.get(&id).unwrap() + &self.modules[&id] } /// Updates the last modified time for the module corresponding to `path`. @@ -257,7 +257,7 @@ impl ModuleResolver { if module.path().root() == &root_path { let normalized = path.canonicalize().ok()?; - if !module.path().resolved().starts_with(&normalized) { + if !module.path().resolved().starts_with(normalized) { // This path is for a module with the same name but with a different precedence. For example: // ``` // src/foo.py @@ -507,8 +507,8 @@ mod tests { let baz = bar.join("baz.py"); std::fs::create_dir_all(&bar)?; - std::fs::write(&foo.join("__init__.py"), "")?; - std::fs::write(&bar.join("__init__.py"), "")?; + std::fs::write(foo.join("__init__.py"), "")?; + std::fs::write(bar.join("__init__.py"), "")?; std::fs::write(&baz, "print('Hello, world!')")?; let baz_id = test_case.resolver.resolve(ModuleName::new("foo.bar.baz")); @@ -535,7 +535,7 @@ mod tests { let baz = bar.join("baz.py"); std::fs::create_dir_all(&bar)?; - std::fs::write(&foo.join("__init__.py"), "")?; + std::fs::write(foo.join("__init__.py"), "")?; std::fs::write(&baz, "print('Hello, world!')")?; let baz_id = test_case.resolver.resolve(ModuleName::new("foo.bar.baz")); diff --git a/crates/ruff_python_ast/src/node.rs b/crates/ruff_python_ast/src/node.rs index 0dd2bf036b16d7..ac193bfe7a73dc 100644 --- a/crates/ruff_python_ast/src/node.rs +++ b/crates/ruff_python_ast/src/node.rs @@ -17,7 +17,7 @@ pub trait AstNode: Ranged { fn cast(kind: AnyNode) -> Option where Self: Sized; - fn cast_ref<'a>(kind: AnyNodeRef<'a>) -> Option>; + fn cast_ref(kind: AnyNodeRef<'_>) -> Option>; fn can_cast(kind: NodeKind) -> bool;