From dd3a9851098996be01df02b5821369771aa8c003 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Thu, 25 Dec 2025 11:26:44 +0100 Subject: [PATCH] [ty] Spell out "method resolution order" in `unsupported-base` subdiagnostic (#22194) --- ...lution_Or…_-_`__bases__`_includes…_(d2532518c44112c8).snap | 4 ++-- ...lution_Or…_-_`__bases__`_lists_th…_(6f8d0bf648c4b305).snap | 2 +- crates/ty_python_semantic/src/types/diagnostic.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_includes…_(d2532518c44112c8).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_includes…_(d2532518c44112c8).snap index d64890246c..61e80d5864 100644 --- a/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_includes…_(d2532518c44112c8).snap +++ b/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_includes…_(d2532518c44112c8).snap @@ -53,7 +53,7 @@ warning[unsupported-base]: Unsupported class base 18 | 19 | reveal_mro(Foo) # revealed: (, Unknown, ) | -info: ty cannot resolve a consistent MRO for class `Foo` due to this base +info: ty cannot resolve a consistent method resolution order (MRO) for class `Foo` due to this base info: Only class objects or `Any` are supported as class bases info: rule `unsupported-base` is enabled by default @@ -68,7 +68,7 @@ warning[unsupported-base]: Unsupported class base 27 | class D(C): ... # error: [unsupported-base] | ^ Has type `.C @ src/mdtest_snippet.py:23'> | .C @ src/mdtest_snippet.py:25'>` | -info: ty cannot resolve a consistent MRO for class `D` due to this base +info: ty cannot resolve a consistent method resolution order (MRO) for class `D` due to this base info: Only class objects or `Any` are supported as class bases info: rule `unsupported-base` is enabled by default diff --git a/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_lists_th…_(6f8d0bf648c4b305).snap b/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_lists_th…_(6f8d0bf648c4b305).snap index 86642e1a83..d5be15c199 100644 --- a/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_lists_th…_(6f8d0bf648c4b305).snap +++ b/crates/ty_python_semantic/resources/mdtest/snapshots/mro.md_-_Method_Resolution_Or…_-_`__bases__`_lists_th…_(6f8d0bf648c4b305).snap @@ -57,7 +57,7 @@ warning[unsupported-base]: Unsupported class base 7 | class Bad1: 8 | def __mro_entries__(self, bases, extra_arg): | -info: ty cannot resolve a consistent MRO for class `Bar` due to this base +info: ty cannot resolve a consistent method resolution order (MRO) for class `Bar` due to this base info: Only class objects or `Any` are supported as class bases info: rule `unsupported-base` is enabled by default diff --git a/crates/ty_python_semantic/src/types/diagnostic.rs b/crates/ty_python_semantic/src/types/diagnostic.rs index 6df76743c9..7f1a2e7437 100644 --- a/crates/ty_python_semantic/src/types/diagnostic.rs +++ b/crates/ty_python_semantic/src/types/diagnostic.rs @@ -3532,7 +3532,7 @@ fn report_unsupported_base( base_type.display(db) )); diagnostic.info(format_args!( - "ty cannot resolve a consistent MRO for class `{}` due to this base", + "ty cannot resolve a consistent method resolution order (MRO) for class `{}` due to this base", class.name(db) )); diagnostic.info("Only class objects or `Any` are supported as class bases");