File tree 2 files changed +6
-9
lines changed
ruff_linter/src/checkers/ast/analyze
2 files changed +6
-9
lines changed Original file line number Diff line number Diff line change @@ -93,7 +93,7 @@ pub(crate) fn definitions(checker: &mut Checker) {
93
93
}
94
94
95
95
// Compute visibility of all definitions.
96
- let exports: Option < Vec < DunderAllName > > = {
96
+ let exports: Vec < DunderAllName > = {
97
97
checker
98
98
. semantic
99
99
. global_scope ( )
@@ -106,14 +106,15 @@ pub(crate) fn definitions(checker: &mut Checker) {
106
106
. fold ( None , |acc, names| {
107
107
Some ( acc. into_iter ( ) . flatten ( ) . chain ( names) . collect ( ) )
108
108
} )
109
+ . unwrap_or_default ( )
109
110
} ;
110
111
111
112
let definitions = std:: mem:: take ( & mut checker. semantic . definitions ) ;
112
113
let mut overloaded_name: Option < String > = None ;
113
114
for ContextualizedDefinition {
114
115
definition,
115
116
visibility,
116
- } in definitions. resolve ( exports. as_deref ( ) ) . iter ( )
117
+ } in definitions. resolve ( & exports) . iter ( )
117
118
{
118
119
let docstring = docstrings:: extraction:: extract_docstring ( definition) ;
119
120
Original file line number Diff line number Diff line change @@ -187,7 +187,7 @@ impl<'a> Definitions<'a> {
187
187
}
188
188
189
189
/// 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 > {
191
191
let mut definitions: IndexVec < DefinitionId , ContextualizedDefinition < ' a > > =
192
192
IndexVec :: with_capacity ( self . len ( ) ) ;
193
193
@@ -201,9 +201,7 @@ impl<'a> Definitions<'a> {
201
201
MemberKind :: Class ( class) => {
202
202
let parent = & definitions[ member. parent ] ;
203
203
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 ( ) )
207
205
{
208
206
Visibility :: Private
209
207
} else {
@@ -223,9 +221,7 @@ impl<'a> Definitions<'a> {
223
221
MemberKind :: Function ( function) => {
224
222
let parent = & definitions[ member. parent ] ;
225
223
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 ( ) )
229
225
{
230
226
Visibility :: Private
231
227
} else {
You can’t perform that action at this time.
0 commit comments