Cyclic0007/ruff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamings

Browse Source
This commit is contained in:
David Peter
2024-12-17 22:22:58 +01:00
parent 90e639bd20
commit 3a1dbc182f
5 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/red_knot_python_semantic/src/semantic_index/use_def.rs
View File

@@ -532,7 +532,7 @@ impl<'db> UseDefMapBuilder<'db> {
} else {
self.unbound_visibility_constraint_id =
self.all_visibility_constraints
.push(VisibilityConstraintRef::And(
.push(VisibilityConstraintRef::Sequence(
self.unbound_visibility_constraint_id,
new_constraint_id,
));
@@ -662,7 +662,7 @@ impl<'db> UseDefMapBuilder<'db> {
_ => {
let constraint_id =
self.all_visibility_constraints
.push(VisibilityConstraintRef::Or(
.push(VisibilityConstraintRef::Merged(
self.unbound_visibility_constraint_id,
snapshot.unbound_visibility_constraint_id,
));

14
crates/red_knot_python_semantic/src/semantic_index/use_def/symbol_state.rs
View File

@@ -142,7 +142,7 @@ impl SymbolDeclarations {
*existing = constraint;
} else {
*existing = all_visibility_constraints
.push(VisibilityConstraintRef::And(*existing, constraint));
.push(VisibilityConstraintRef::Sequence(*existing, constraint));
}
}
}
@@ -225,7 +225,7 @@ impl SymbolBindings {
*existing = constraint;
} else {
*existing = all_visibility_constraints
.push(VisibilityConstraintRef::And(*existing, constraint));
.push(VisibilityConstraintRef::Sequence(*existing, constraint));
}
}
}
@@ -436,8 +436,9 @@ impl SymbolState {
*current = ScopedVisibilityConstraintId::from_u32(0);
}
_ => {
let constraint_id = all_visibility_constraints
.push(VisibilityConstraintRef::Or(*current, a_vis_constraint));
let constraint_id = all_visibility_constraints.push(
VisibilityConstraintRef::Merged(*current, a_vis_constraint),
);
*current = constraint_id;
}
}
@@ -520,8 +521,9 @@ impl SymbolState {
*current = ScopedVisibilityConstraintId::from_u32(0);
}
_ => {
let constraint_id = all_visibility_constraints
.push(VisibilityConstraintRef::Or(*current, a_vis_constraint));
let constraint_id = all_visibility_constraints.push(
VisibilityConstraintRef::Merged(*current, a_vis_constraint),
);
*current = constraint_id;
}
}

4
crates/red_knot_python_semantic/src/semantic_index/visibility_constraint.rs
View File

@@ -29,6 +29,6 @@ pub(crate) enum VisibilityConstraintRef {
None,
Single(ScopedConstraintId),
Negated(ScopedVisibilityConstraintId),
And(ScopedVisibilityConstraintId, ScopedVisibilityConstraintId),
Or(ScopedVisibilityConstraintId, ScopedVisibilityConstraintId),
Sequence(ScopedVisibilityConstraintId, ScopedVisibilityConstraintId),
Merged(ScopedVisibilityConstraintId, ScopedVisibilityConstraintId),
}

8
crates/red_knot_python_semantic/src/types.rs
View File

@@ -33,7 +33,7 @@ use crate::types::diagnostic::INVALID_TYPE_FORM;
use crate::types::mro::{Mro, MroError, MroIterator};
use crate::types::narrow::narrowing_constraint;
use crate::{Db, FxOrderSet, Module, Program, PythonVersion};
pub(crate) use static_truthiness::static_visibility;
pub(crate) use static_visibility::analyze;
mod builder;
mod call;
@@ -45,7 +45,7 @@ mod infer;
mod mro;
mod narrow;
mod signatures;
mod static_truthiness;
mod static_visibility;
mod string_annotation;
mod unpacker;
@@ -279,7 +279,7 @@ fn bindings_ty<'db>(
visibility_constraint,
} in bindings_with_constraints
{
let static_visibility = static_visibility(
let static_visibility = analyze(
db,
all_constraints,
all_visibility_constraints,
@@ -366,7 +366,7 @@ fn declarations_ty<'db>(
for (declaration, all_constraints, all_visibility_constraints, visibility_constraint) in
declarations
{
let static_visibility = static_visibility(
let static_visibility = analyze(
db,
all_constraints,
all_visibility_constraints,

26
crates/red_knot_python_semantic/src/types/static_truthiness.rs → crates/red_knot_python_semantic/src/types/static_visibility.rs
View File

@@ -12,13 +12,13 @@ use crate::Db;
const MAX_RECURSION_DEPTH: usize = 10;
/// Analyze the statically known visibility for a given visibility constraint.
pub(crate) fn static_visibility<'db>(
pub(crate) fn analyze<'db>(
db: &'db dyn Db,
all_constraints: &IndexVec<ScopedConstraintId, Constraint<'db>>,
all_visibility_constraints: &IndexVec<ScopedVisibilityConstraintId, VisibilityConstraintRef>,
visibility_constraint_id: ScopedVisibilityConstraintId,
) -> Truthiness {
static_visibility_impl(
analyze_impl(
db,
all_constraints,
all_visibility_constraints,
@@ -27,7 +27,7 @@ pub(crate) fn static_visibility<'db>(
)
}
fn static_visibility_impl<'db>(
fn analyze_impl<'db>(
db: &'db dyn Db,
all_constraints: &IndexVec<ScopedConstraintId, Constraint<'db>>,
all_visibility_constraints: &IndexVec<ScopedVisibilityConstraintId, VisibilityConstraintRef>,
@@ -88,7 +88,7 @@ fn static_visibility_impl<'db>(
},
}
}
VisibilityConstraintRef::Negated(visibility_constraint_id) => static_visibility_impl(
VisibilityConstraintRef::Negated(visibility_constraint_id) => analyze_impl(
db,
all_constraints,
all_visibility_constraints,
@@ -97,8 +97,8 @@ fn static_visibility_impl<'db>(
)
.negate(),
VisibilityConstraintRef::None => Truthiness::AlwaysTrue,
VisibilityConstraintRef::And(lhs_id, rhs_id) => {
let lhs = static_visibility_impl(
VisibilityConstraintRef::Sequence(lhs_id, rhs_id) => {
let lhs = analyze_impl(
db,
all_constraints,
all_visibility_constraints,
@@ -110,7 +110,7 @@ fn static_visibility_impl<'db>(
return Truthiness::AlwaysFalse;
}
let rhs = static_visibility_impl(
let rhs = analyze_impl(
db,
all_constraints,
all_visibility_constraints,
@@ -126,8 +126,8 @@ fn static_visibility_impl<'db>(
Truthiness::Ambiguous
}
}
VisibilityConstraintRef::Or(lhs_id, rhs_id) => {
let lhs = static_visibility_impl(
VisibilityConstraintRef::Merged(lhs_id, rhs_id) => {
let lhs = analyze_impl(
db,
all_constraints,
all_visibility_constraints,
@@ -139,7 +139,7 @@ fn static_visibility_impl<'db>(
return Truthiness::AlwaysTrue;
}
let rhs = static_visibility_impl(
let rhs = analyze_impl(
db,
all_constraints,
all_visibility_constraints,
@@ -147,10 +147,10 @@ fn static_visibility_impl<'db>(
max_depth - 1,
);
if lhs == Truthiness::AlwaysFalse && rhs == Truthiness::AlwaysFalse {
Truthiness::AlwaysFalse
} else if rhs == Truthiness::AlwaysTrue {
if rhs == Truthiness::AlwaysTrue {
Truthiness::AlwaysTrue
} else if lhs == Truthiness::AlwaysFalse && rhs == Truthiness::AlwaysFalse {
Truthiness::AlwaysFalse
} else {
Truthiness::Ambiguous
}