Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly ignore bivariate types in `type-name-incorrect-variance` (#5660) 

## Summary

#5658 didn't actually ignore bivariate types in some all cases (sorry
about that). This PR fixes that and adds bivariate types to the test
fixture.

## Test Plan

`cargo test`
This commit is contained in:
Tom Kuson 2023-07-10 19:19:17 +01:00 committed by GitHub
parent 5ab9538573
commit b8a6ce43a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/ruff/resources/test/fixtures/pylint/type_name_incorrect_variance.py vendored
View File

@ -57,3 +57,12 @@ T_contra = TypeVar("T_contra", contravariant=True)
T_contra = TypeVar("T_contra", covariant=False, contravariant=True) T_contra = TypeVar("T_contra", covariant=False, contravariant=True)
P_contra = ParamSpec("P_contra", contravariant=True) P_contra = ParamSpec("P_contra", contravariant=True)
P_contra = ParamSpec("P_contra", covariant=False, contravariant=True) P_contra = ParamSpec("P_contra", covariant=False, contravariant=True)
# Bivariate types are errors, but not covered by this check.
T = TypeVar("T", covariant=True, contravariant=True)
P = ParamSpec("P", covariant=True, contravariant=True)
T_co = TypeVar("T_co", covariant=True, contravariant=True)
P_co = ParamSpec("P_co", covariant=True, contravariant=True)
T_contra = TypeVar("T_contra", covariant=True, contravariant=True)
P_contra = ParamSpec("P_contra", covariant=True, contravariant=True)

4
crates/ruff/src/rules/pylint/rules/type_name_incorrect_variance.rs
View File

@ -130,6 +130,7 @@ pub(crate) fn type_name_incorrect_variance(checker: &mut Checker, value: &Expr)
.trim_end_matches("_co") .trim_end_matches("_co")
.trim_end_matches("_contra"); .trim_end_matches("_contra");
let replacement_name: String = match variance { let replacement_name: String = match variance {
VarVariance::Bivariance => return, // Bivariate type are invalid, so ignore them for this rule.
VarVariance::Covariance => format!("{name_root}_co"), VarVariance::Covariance => format!("{name_root}_co"),
VarVariance::Contravariance => format!("{name_root}_contra"), VarVariance::Contravariance => format!("{name_root}_contra"),
VarVariance::Invariance => name_root.to_string(), VarVariance::Invariance => name_root.to_string(),
@ -163,6 +164,7 @@ fn variance(covariant: Option<&Expr>, contravariant: Option<&Expr>) -> VarVarian
covariant.map(is_const_true), covariant.map(is_const_true),
contravariant.map(is_const_true), contravariant.map(is_const_true),
) { ) {
(Some(true), Some(true)) => VarVariance::Bivariance,
(Some(true), _) => VarVariance::Covariance, (Some(true), _) => VarVariance::Covariance,
(_, Some(true)) => VarVariance::Contravariance, (_, Some(true)) => VarVariance::Contravariance,
_ => VarVariance::Invariance, _ => VarVariance::Invariance,
@ -186,6 +188,7 @@ impl fmt::Display for VarKind {
#[derive(Debug, PartialEq, Eq, Copy, Clone)] #[derive(Debug, PartialEq, Eq, Copy, Clone)]
enum VarVariance { enum VarVariance {
Bivariance,
Covariance, Covariance,
Contravariance, Contravariance,
Invariance, Invariance,
@ -194,6 +197,7 @@ enum VarVariance {
impl fmt::Display for VarVariance { impl fmt::Display for VarVariance {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
match self { match self {
VarVariance::Bivariance => fmt.write_str("bivariance"),
VarVariance::Covariance => fmt.write_str("covariance"), VarVariance::Covariance => fmt.write_str("covariance"),
VarVariance::Contravariance => fmt.write_str("contravariance"), VarVariance::Contravariance => fmt.write_str("contravariance"),
VarVariance::Invariance => fmt.write_str("invariance"), VarVariance::Invariance => fmt.write_str("invariance"),