diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Bad_`__getitem__`_method.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Bad_`__getitem__`_method.snap index 4e65bc2aa0..b80fd4586d 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Bad_`__getitem__`_method.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Bad_`__getitem__`_method.snap @@ -40,13 +40,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:11:5 | 9 | # error: [not-iterable] 10 | for x in Iterable(): 11 | reveal_type(x) # revealed: int - | ^^^^^^^^^^^^^^ Revealed type is `int` + | ^^^^^^^^^^^^^^ `int` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_No_`__iter__`_method_and_`__getitem__`_is_not_callable.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_No_`__iter__`_method_and_`__getitem__`_is_not_callable.snap index a6ad58539c..a9d5964a6b 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_No_`__iter__`_method_and_`__getitem__`_is_not_callable.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_No_`__iter__`_method_and_`__getitem__`_is_not_callable.snap @@ -37,13 +37,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:8:5 | 6 | # error: [not-iterable] 7 | for x in Bad(): 8 | reveal_type(x) # revealed: Unknown - | ^^^^^^^^^^^^^^ Revealed type is `Unknown` + | ^^^^^^^^^^^^^^ `Unknown` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly-not-callable_`__getitem__`_method.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly-not-callable_`__getitem__`_method.snap index cf3b51c24e..6a0de7346b 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly-not-callable_`__getitem__`_method.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly-not-callable_`__getitem__`_method.snap @@ -59,13 +59,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:24:9 | 22 | for x in Iterable1(): 23 | # TODO... `int` might be ideal here? 24 | reveal_type(x) # revealed: int | Unknown - | ^^^^^^^^^^^^^^ Revealed type is `int | Unknown` + | ^^^^^^^^^^^^^^ `int | Unknown` 25 | 26 | # error: [not-iterable] | @@ -86,13 +86,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:29:9 | 27 | for y in Iterable2(): 28 | # TODO... `int` might be ideal here? 29 | reveal_type(y) # revealed: int | Unknown - | ^^^^^^^^^^^^^^ Revealed type is `int | Unknown` + | ^^^^^^^^^^^^^^ `int | Unknown` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__getitem__`_methods.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__getitem__`_methods.snap index 4debb18954..9ac73cf75b 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__getitem__`_methods.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__getitem__`_methods.snap @@ -56,13 +56,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:22:9 | 20 | for x in Iterable1(): 21 | # TODO: `str` might be better 22 | reveal_type(x) # revealed: str | Unknown - | ^^^^^^^^^^^^^^ Revealed type is `str | Unknown` + | ^^^^^^^^^^^^^^ `str | Unknown` 23 | 24 | # error: [not-iterable] | @@ -82,13 +82,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:26:9 | 24 | # error: [not-iterable] 25 | for y in Iterable2(): 26 | reveal_type(y) # revealed: str | int - | ^^^^^^^^^^^^^^ Revealed type is `str | int` + | ^^^^^^^^^^^^^^ `str | int` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__iter__`_methods.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__iter__`_methods.snap index cd1e3fb269..5f5ed188f0 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__iter__`_methods.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__iter__`_methods.snap @@ -59,13 +59,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:18:9 | 16 | # error: [not-iterable] 17 | for x in Iterable1(): 18 | reveal_type(x) # revealed: int - | ^^^^^^^^^^^^^^ Revealed type is `int` + | ^^^^^^^^^^^^^^ `int` 19 | 20 | class Iterable2: | @@ -86,13 +86,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:30:9 | 28 | for x in Iterable2(): 29 | # TODO: `int` would probably be better here: 30 | reveal_type(x) # revealed: int | Unknown - | ^^^^^^^^^^^^^^ Revealed type is `int | Unknown` + | ^^^^^^^^^^^^^^ `int | Unknown` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__next__`_method.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__next__`_method.snap index 9804e27166..e4957e08fd 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__next__`_method.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_invalid_`__next__`_method.snap @@ -63,13 +63,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:29:9 | 27 | # error: [not-iterable] 28 | for x in Iterable1(): 29 | reveal_type(x) # revealed: int | str - | ^^^^^^^^^^^^^^ Revealed type is `int | str` + | ^^^^^^^^^^^^^^ `int | str` 30 | 31 | # error: [not-iterable] | @@ -90,13 +90,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:34:9 | 32 | for y in Iterable2(): 33 | # TODO: `int` would probably be better here: 34 | reveal_type(y) # revealed: int | Unknown - | ^^^^^^^^^^^^^^ Revealed type is `int | Unknown` + | ^^^^^^^^^^^^^^ `int | Unknown` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_bad_`__getitem__`_method.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_bad_`__getitem__`_method.snap index 13cc3f2fd9..dfcb11a238 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_bad_`__getitem__`_method.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_bad_`__getitem__`_method.snap @@ -48,13 +48,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:19:9 | 17 | # error: [not-iterable] 18 | for x in Iterable(): 19 | reveal_type(x) # revealed: int | bytes - | ^^^^^^^^^^^^^^ Revealed type is `int | bytes` + | ^^^^^^^^^^^^^^ `int | bytes` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_possibly_invalid_`__getitem__`.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_possibly_invalid_`__getitem__`.snap index f0eb11df61..c7578e8c71 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_possibly_invalid_`__getitem__`.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_possibly_invalid_`__getitem__`.snap @@ -67,13 +67,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:33:9 | 31 | for x in Iterable1(): 32 | # TODO: `bytes | str` might be better 33 | reveal_type(x) # revealed: bytes | str | Unknown - | ^^^^^^^^^^^^^^ Revealed type is `bytes | str | Unknown` + | ^^^^^^^^^^^^^^ `bytes | str | Unknown` 34 | 35 | # error: [not-iterable] | @@ -93,13 +93,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:37:9 | 35 | # error: [not-iterable] 36 | for y in Iterable2(): 37 | reveal_type(y) # revealed: bytes | str | int - | ^^^^^^^^^^^^^^ Revealed type is `bytes | str | int` + | ^^^^^^^^^^^^^^ `bytes | str | int` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_possibly_unbound_`__getitem__`.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_possibly_unbound_`__getitem__`.snap index 7508382374..dacd22e758 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_possibly_unbound_`__getitem__`.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Possibly_unbound_`__iter__`_and_possibly_unbound_`__getitem__`.snap @@ -47,13 +47,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:18:9 | 16 | # error: [not-iterable] 17 | for x in Iterable(): 18 | reveal_type(x) # revealed: int | bytes - | ^^^^^^^^^^^^^^ Revealed type is `int | bytes` + | ^^^^^^^^^^^^^^ `int | bytes` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterable_where_one_union_element_has_invalid_`__iter__`_method.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterable_where_one_union_element_has_invalid_`__iter__`_method.snap index 094348c018..f5f70d0c13 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterable_where_one_union_element_has_invalid_`__iter__`_method.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterable_where_one_union_element_has_invalid_`__iter__`_method.snap @@ -49,13 +49,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:19:9 | 17 | # error: [not-iterable] 18 | for x in Test() if flag else Test2(): 19 | reveal_type(x) # revealed: int - | ^^^^^^^^^^^^^^ Revealed type is `int` + | ^^^^^^^^^^^^^^ `int` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterable_where_one_union_element_has_no_`__iter__`_method.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterable_where_one_union_element_has_no_`__iter__`_method.snap index 444f0cb81a..c474ec522c 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterable_where_one_union_element_has_no_`__iter__`_method.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_Union_type_as_iterable_where_one_union_element_has_no_`__iter__`_method.snap @@ -44,13 +44,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:14:9 | 12 | # error: [not-iterable] 13 | for x in Test() if flag else 42: 14 | reveal_type(x) # revealed: int - | ^^^^^^^^^^^^^^ Revealed type is `int` + | ^^^^^^^^^^^^^^ `int` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_With_non-callable_iterator.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_With_non-callable_iterator.snap index 10bb75e00b..2fb989fd46 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_With_non-callable_iterator.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_With_non-callable_iterator.snap @@ -57,13 +57,13 @@ warning: lint:possibly-unresolved-reference ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:16:5 | 14 | # revealed: Unknown 15 | # error: [possibly-unresolved-reference] 16 | reveal_type(x) - | ^^^^^^^^^^^^^^ Revealed type is `Unknown` + | ^^^^^^^^^^^^^^ `Unknown` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_does_not_return_an_iterator.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_does_not_return_an_iterator.snap index 38184d4914..cf9109de80 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_does_not_return_an_iterator.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_does_not_return_an_iterator.snap @@ -38,13 +38,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:9:5 | 7 | # error: [not-iterable] 8 | for x in Bad(): 9 | reveal_type(x) # revealed: Unknown - | ^^^^^^^^^^^^^^ Revealed type is `Unknown` + | ^^^^^^^^^^^^^^ `Unknown` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_method_with_a_bad_signature.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_method_with_a_bad_signature.snap index 55145ac407..65331fe197 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_method_with_a_bad_signature.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_method_with_a_bad_signature.snap @@ -42,13 +42,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:13:5 | 11 | # error: [not-iterable] 12 | for x in Iterable(): 13 | reveal_type(x) # revealed: int - | ^^^^^^^^^^^^^^ Revealed type is `int` + | ^^^^^^^^^^^^^^ `int` | ``` diff --git a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_returns_an_iterator_with_an_invalid_`__next__`_method.snap b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_returns_an_iterator_with_an_invalid_`__next__`_method.snap index bde37bf227..5807ade696 100644 --- a/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_returns_an_iterator_with_an_invalid_`__next__`_method.snap +++ b/crates/red_knot_python_semantic/resources/mdtest/snapshots/for.md_-_For_loops_-_`__iter__`_returns_an_iterator_with_an_invalid_`__next__`_method.snap @@ -53,13 +53,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:20:5 | 18 | # error: [not-iterable] 19 | for x in Iterable1(): 20 | reveal_type(x) # revealed: int - | ^^^^^^^^^^^^^^ Revealed type is `int` + | ^^^^^^^^^^^^^^ `int` 21 | 22 | # error: [not-iterable] | @@ -79,13 +79,13 @@ error: lint:not-iterable ``` ``` -info: revealed-type +info: revealed-type: Revealed type --> /src/mdtest_snippet.py:24:5 | 22 | # error: [not-iterable] 23 | for y in Iterable2(): 24 | reveal_type(y) # revealed: Unknown - | ^^^^^^^^^^^^^^ Revealed type is `Unknown` + | ^^^^^^^^^^^^^^ `Unknown` | ``` diff --git a/crates/red_knot_test/src/matcher.rs b/crates/red_knot_test/src/matcher.rs index 19184cecfe..8a68b5483a 100644 --- a/crates/red_knot_test/src/matcher.rs +++ b/crates/red_knot_test/src/matcher.rs @@ -175,7 +175,7 @@ impl Unmatched for &Diagnostic { maybe_add_undefined_reveal_clarification( self, - format_args!(r#"[{id}] "{message}""#, message = self.primary_message()), + format_args!(r#"[{id}] "{message}""#, message = self.concise_message()), ) } } @@ -191,7 +191,7 @@ impl UnmatchedWithColumn for &Diagnostic { self, format_args!( r#"{column} [{id}] "{message}""#, - message = self.primary_message() + message = self.concise_message() ), ) } @@ -283,14 +283,16 @@ impl Matcher { match assertion { ParsedAssertion::Error(error) => { let position = unmatched.iter().position(|diagnostic| { - !error.rule.is_some_and(|rule| { + let lint_name_matches = !error.rule.is_some_and(|rule| { !(diagnostic.id().is_lint_named(rule) || diagnostic.id().matches(rule)) - }) && error + }); + let column_matches = error .column - .is_none_or(|col| col == self.column(diagnostic)) - && error - .message_contains - .is_none_or(|needle| diagnostic.primary_message().contains(needle)) + .is_none_or(|col| col == self.column(diagnostic)); + let message_matches = error.message_contains.is_none_or(|needle| { + diagnostic.concise_message().to_string().contains(needle) + }); + lint_name_matches && column_matches && message_matches }); if let Some(position) = position { unmatched.swap_remove(position); @@ -305,11 +307,15 @@ impl Matcher { let mut matched_revealed_type = None; let mut matched_undefined_reveal = None; - let expected_reveal_type_message = format!("Revealed type is `{expected_type}`"); + let expected_reveal_type_message = format!("`{expected_type}`"); for (index, diagnostic) in unmatched.iter().enumerate() { if matched_revealed_type.is_none() && diagnostic.id() == DiagnosticId::RevealedType - && diagnostic.primary_message() == expected_reveal_type_message + && diagnostic + .primary_annotation() + .and_then(|a| a.get_message()) + .unwrap_or_default() + == expected_reveal_type_message { matched_revealed_type = Some(index); } else if matched_undefined_reveal.is_none() @@ -361,7 +367,11 @@ mod tests { } fn into_diagnostic(self, file: File) -> Diagnostic { - let mut diag = Diagnostic::new(self.id, Severity::Error, ""); + let mut diag = if self.id == DiagnosticId::RevealedType { + Diagnostic::new(self.id, Severity::Error, "Revealed type") + } else { + Diagnostic::new(self.id, Severity::Error, "") + }; let span = Span::from(file).with_range(self.range); diag.annotate(Annotation::primary(span).message(self.message)); diag @@ -417,7 +427,7 @@ mod tests { "x # revealed: Foo", vec![ExpectedDiagnostic::new( DiagnosticId::RevealedType, - "Revealed type is `Foo`", + "`Foo`", 0, )], ); @@ -431,7 +441,7 @@ mod tests { "x # revealed: Foo", vec![ExpectedDiagnostic::new( DiagnosticId::lint("not-revealed-type"), - "Revealed type is `Foo`", + "`Foo`", 0, )], ); @@ -442,7 +452,7 @@ mod tests { 0, &[ "unmatched assertion: revealed: Foo", - r#"unexpected error: 1 [not-revealed-type] "Revealed type is `Foo`""#, + r#"unexpected error: 1 [not-revealed-type] "`Foo`""#, ], )], ); @@ -465,7 +475,7 @@ mod tests { 0, &[ "unmatched assertion: revealed: Foo", - r#"unexpected error: 1 [revealed-type] "Something else""#, + r#"unexpected error: 1 [revealed-type] "Revealed type: Something else""#, ], )], ); @@ -483,7 +493,7 @@ mod tests { let result = get_result( "x # revealed: Foo", vec![ - ExpectedDiagnostic::new(DiagnosticId::RevealedType, "Revealed type is `Foo`", 0), + ExpectedDiagnostic::new(DiagnosticId::RevealedType, "`Foo`", 0), ExpectedDiagnostic::new( DiagnosticId::lint("undefined-reveal"), "Doesn't matter", @@ -514,7 +524,7 @@ mod tests { let result = get_result( "x # revealed: Foo", vec![ - ExpectedDiagnostic::new(DiagnosticId::RevealedType, "Revealed type is `Bar`", 0), + ExpectedDiagnostic::new(DiagnosticId::RevealedType, "`Bar`", 0), ExpectedDiagnostic::new( DiagnosticId::lint("undefined-reveal"), "Doesn't matter", @@ -529,7 +539,7 @@ mod tests { 0, &[ "unmatched assertion: revealed: Foo", - r#"unexpected error: 1 [revealed-type] "Revealed type is `Bar`""#, + r#"unexpected error: 1 [revealed-type] "Revealed type: `Bar`""#, ], )], ); @@ -545,11 +555,7 @@ mod tests { "undefined reveal message", 0, ), - ExpectedDiagnostic::new( - DiagnosticId::RevealedType, - "Revealed type is `Literal[1]`", - 12, - ), + ExpectedDiagnostic::new(DiagnosticId::RevealedType, "`Literal[1]`", 12), ], ); @@ -560,7 +566,7 @@ mod tests { &[ "used built-in `reveal_type`: add a `# revealed` assertion on this line (\ original diagnostic: [undefined-reveal] \"undefined reveal message\")", - r#"unexpected error: [revealed-type] "Revealed type is `Literal[1]`""#, + r#"unexpected error: [revealed-type] "Revealed type: `Literal[1]`""#, ], )], ); @@ -576,11 +582,7 @@ mod tests { "undefined reveal message", 0, ), - ExpectedDiagnostic::new( - DiagnosticId::RevealedType, - "Revealed type is `Literal[1]`", - 12, - ), + ExpectedDiagnostic::new(DiagnosticId::RevealedType, "`Literal[1]`", 12), ], ); @@ -592,7 +594,7 @@ mod tests { "unmatched assertion: error: [something-else]", "used built-in `reveal_type`: add a `# revealed` assertion on this line (\ original diagnostic: 1 [undefined-reveal] \"undefined reveal message\")", - r#"unexpected error: 13 [revealed-type] "Revealed type is `Literal[1]`""#, + r#"unexpected error: 13 [revealed-type] "Revealed type: `Literal[1]`""#, ], )], ); @@ -1008,11 +1010,7 @@ mod tests { &source, vec![ ExpectedDiagnostic::new(DiagnosticId::lint("undefined-reveal"), "msg", reveal), - ExpectedDiagnostic::new( - DiagnosticId::RevealedType, - "Revealed type is `Literal[5]`", - reveal, - ), + ExpectedDiagnostic::new(DiagnosticId::RevealedType, "`Literal[5]`", reveal), ], );