about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2023-01-06 21:53:59 -0800
committerGitHub <noreply@github.com>2023-01-06 21:53:59 -0800
commit258257a029e8b4e1e0683d48592832b06f485861 (patch)
tree90cbafadfd5b01fb543c1d56324ba32527efb394 /src/test/ui
parent84f22e44c588be9c9058d6d6ed02a21aa32ad843 (diff)
parenta9d093bd6b88e0f129cfd9d063337940dd8823b8 (diff)
downloadrust-258257a029e8b4e1e0683d48592832b06f485861.tar.gz
rust-258257a029e8b4e1e0683d48592832b06f485861.zip
Rollup merge of #106525 - compiler-errors:new-solver-wf, r=jackh726
Report WF error for chalk *and* new solver

addressing this nit https://github.com/rust-lang/rust/pull/106385#discussion_r1062571070

No test yet because new solver is currently unusable, lol

r? `@lcnr`
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/chalkify/recursive_where_clause_on_type.rs4
-rw-r--r--src/test/ui/chalkify/recursive_where_clause_on_type.stderr4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/chalkify/recursive_where_clause_on_type.rs b/src/test/ui/chalkify/recursive_where_clause_on_type.rs
index 5855f000c7b..c2c8aa6aabe 100644
--- a/src/test/ui/chalkify/recursive_where_clause_on_type.rs
+++ b/src/test/ui/chalkify/recursive_where_clause_on_type.rs
@@ -25,6 +25,6 @@ fn foo<T: Foo>() {
 fn main() {
     // For some reason, the error is duplicated...
 
-    foo::<S>() //~ ERROR the type `S` is not well-formed (chalk)
-    //~^ ERROR the type `S` is not well-formed (chalk)
+    foo::<S>() //~ ERROR the type `S` is not well-formed
+    //~^ ERROR the type `S` is not well-formed
 }
diff --git a/src/test/ui/chalkify/recursive_where_clause_on_type.stderr b/src/test/ui/chalkify/recursive_where_clause_on_type.stderr
index fddd5895927..cead5adeaaa 100644
--- a/src/test/ui/chalkify/recursive_where_clause_on_type.stderr
+++ b/src/test/ui/chalkify/recursive_where_clause_on_type.stderr
@@ -1,10 +1,10 @@
-error: the type `S` is not well-formed (chalk)
+error: the type `S` is not well-formed
   --> $DIR/recursive_where_clause_on_type.rs:28:11
    |
 LL |     foo::<S>()
    |           ^
 
-error: the type `S` is not well-formed (chalk)
+error: the type `S` is not well-formed
   --> $DIR/recursive_where_clause_on_type.rs:28:5
    |
 LL |     foo::<S>()