Skip to content

Commit 40a9abf

Browse files
committed
fix grammar
1 parent 16063f8 commit 40a9abf

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

crates/ty_python_semantic/resources/mdtest/snapshots/liskov.md_-_The_Liskov_Substitut…_-_Staticmethods_and_cl…_(49e28aae6fdd1291).snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ error[invalid-method-override]: Invalid override of method `instance_method`
8585
3 | @classmethod
8686
4 | def class_method(cls, x: int) -> int: ...
8787
|
88-
info: `BadChild1.instance_method` is a staticmethod but `Parent.instance_method` is a instance method
88+
info: `BadChild1.instance_method` is a staticmethod but `Parent.instance_method` is an instance method
8989
info: This violates the Liskov Substitution Principle
9090
info: rule `invalid-method-override` is enabled by default
9191
@@ -111,7 +111,7 @@ error[invalid-method-override]: Invalid override of method `static_method`
111111
7 |
112112
8 | class BadChild1(Parent):
113113
|
114-
info: `BadChild1.static_method` is a instance method but `Parent.static_method` is a staticmethod
114+
info: `BadChild1.static_method` is an instance method but `Parent.static_method` is a staticmethod
115115
info: This violates the Liskov Substitution Principle
116116
info: rule `invalid-method-override` is enabled by default
117117

crates/ty_python_semantic/src/types/class.rs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,21 +1260,15 @@ impl MethodDecorator {
12601260
}
12611261
}
12621262

1263-
pub(crate) const fn as_str(self) -> &'static str {
1263+
pub(crate) const fn description(self) -> &'static str {
12641264
match self {
1265-
MethodDecorator::None => "instance method",
1266-
MethodDecorator::ClassMethod => "classmethod",
1267-
MethodDecorator::StaticMethod => "staticmethod",
1265+
MethodDecorator::None => "an instance method",
1266+
MethodDecorator::ClassMethod => "a classmethod",
1267+
MethodDecorator::StaticMethod => "a staticmethod",
12681268
}
12691269
}
12701270
}
12711271

1272-
impl std::fmt::Display for MethodDecorator {
1273-
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
1274-
f.write_str(self.as_str())
1275-
}
1276-
}
1277-
12781272
/// Kind-specific metadata for different types of fields
12791273
#[derive(Debug, Clone, PartialEq, Eq, salsa::Update, get_size2::GetSize)]
12801274
pub(crate) enum FieldKind<'db> {

crates/ty_python_semantic/src/types/diagnostic.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3534,8 +3534,10 @@ pub(super) fn report_invalid_method_override<'db>(
35343534
&& superclass_function_kind != subclass_function_kind
35353535
{
35363536
diagnostic.info(format_args!(
3537-
"`{class_name}.{member}` is a {subclass_function_kind} \
3538-
but `{overridden_method}` is a {superclass_function_kind}"
3537+
"`{class_name}.{member}` is {subclass_function_kind} \
3538+
but `{overridden_method}` is {superclass_function_kind}",
3539+
superclass_function_kind = superclass_function_kind.description(),
3540+
subclass_function_kind = subclass_function_kind.description(),
35393541
));
35403542
}
35413543

0 commit comments

Comments
 (0)