Apply Micha's suggestion

astral-sh · Mar 22, 2024 · 20e70c3 · 20e70c3
1 parent 6086cb7
commit 20e70c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/definitions.rs b/crates/ruff_linter/src/checkers/ast/analyze/definitions.rs
@@ -113,7 +113,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
     for ContextualizedDefinition {
         definition,
         visibility,
-    } in definitions.resolve(exports.as_deref()).iter()
+    } in definitions.resolve(&exports.unwrap_or_default()).iter()
     {
         let docstring = docstrings::extraction::extract_docstring(definition);
 

diff --git a/crates/ruff_python_semantic/src/definition.rs b/crates/ruff_python_semantic/src/definition.rs
@@ -187,7 +187,7 @@ impl<'a> Definitions<'a> {
     }
 
     /// Resolve the visibility of each definition in the collection.
-    pub fn resolve(self, exports: Option<&[DunderAllName]>) -> ContextualizedDefinitions<'a> {
+    pub fn resolve(self, exports: &[DunderAllName]) -> ContextualizedDefinitions<'a> {
         let mut definitions: IndexVec<DefinitionId, ContextualizedDefinition<'a>> =
             IndexVec::with_capacity(self.len());
 
@@ -201,9 +201,7 @@ impl<'a> Definitions<'a> {
                         MemberKind::Class(class) => {
                             let parent = &definitions[member.parent];
                             if parent.visibility.is_private()
-                                || exports.is_some_and(|exports| {
-                                    !exports.iter().any(|export| export.name == member.name())
-                                })
+                                || !exports.iter().any(|export| export.name == member.name())
                             {
                                 Visibility::Private
                             } else {
@@ -223,9 +221,7 @@ impl<'a> Definitions<'a> {
                         MemberKind::Function(function) => {
                             let parent = &definitions[member.parent];
                             if parent.visibility.is_private()
-                                || exports.is_some_and(|exports| {
-                                    !exports.iter().any(|export| export.name == member.name())
-                                })
+                                || !exports.iter().any(|export| export.name == member.name())
                             {
                                 Visibility::Private
                             } else {