Skip to content

Commit 29f6065

Browse files
committed
Apply Micha's suggestion
1 parent 6086cb7 commit 29f6065

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

crates/ruff_linter/src/checkers/ast/analyze/definitions.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
9393
}
9494

9595
// Compute visibility of all definitions.
96-
let exports: Option<Vec<DunderAllName>> = {
96+
let exports: Vec<DunderAllName> = {
9797
checker
9898
.semantic
9999
.global_scope()
@@ -106,14 +106,15 @@ pub(crate) fn definitions(checker: &mut Checker) {
106106
.fold(None, |acc, names| {
107107
Some(acc.into_iter().flatten().chain(names).collect())
108108
})
109+
.unwrap_or_default()
109110
};
110111

111112
let definitions = std::mem::take(&mut checker.semantic.definitions);
112113
let mut overloaded_name: Option<String> = None;
113114
for ContextualizedDefinition {
114115
definition,
115116
visibility,
116-
} in definitions.resolve(exports.as_deref()).iter()
117+
} in definitions.resolve(&exports).iter()
117118
{
118119
let docstring = docstrings::extraction::extract_docstring(definition);
119120

crates/ruff_python_semantic/src/definition.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ impl<'a> Definitions<'a> {
187187
}
188188

189189
/// Resolve the visibility of each definition in the collection.
190-
pub fn resolve(self, exports: Option<&[DunderAllName]>) -> ContextualizedDefinitions<'a> {
190+
pub fn resolve(self, exports: &[DunderAllName]) -> ContextualizedDefinitions<'a> {
191191
let mut definitions: IndexVec<DefinitionId, ContextualizedDefinition<'a>> =
192192
IndexVec::with_capacity(self.len());
193193

@@ -201,9 +201,7 @@ impl<'a> Definitions<'a> {
201201
MemberKind::Class(class) => {
202202
let parent = &definitions[member.parent];
203203
if parent.visibility.is_private()
204-
|| exports.is_some_and(|exports| {
205-
!exports.iter().any(|export| export.name == member.name())
206-
})
204+
|| !exports.iter().any(|export| export.name == member.name())
207205
{
208206
Visibility::Private
209207
} else {
@@ -223,9 +221,7 @@ impl<'a> Definitions<'a> {
223221
MemberKind::Function(function) => {
224222
let parent = &definitions[member.parent];
225223
if parent.visibility.is_private()
226-
|| exports.is_some_and(|exports| {
227-
!exports.iter().any(|export| export.name == member.name())
228-
})
224+
|| !exports.iter().any(|export| export.name == member.name())
229225
{
230226
Visibility::Private
231227
} else {

0 commit comments

Comments
 (0)