about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2023-07-04 08:28:35 +0000
committerOli Scherer <git-spam-no-reply9815368754983@oli-obk.de>2023-07-05 07:43:35 +0000
commit9cacfae3e901982558d19efabfc32f742436396f (patch)
tree3e1bb42d74eb219c6ca461f06df3fc2a6b297b64
parent97d831d008601d02d22cbd1b21c4b45809eabe10 (diff)
downloadrust-9cacfae3e901982558d19efabfc32f742436396f.tar.gz
rust-9cacfae3e901982558d19efabfc32f742436396f.zip
Fix some tests to *only* test their main issue and not have secondary failures
-rw-r--r--tests/ui/type-alias-impl-trait/auto-trait-leakage3.rs2
-rw-r--r--tests/ui/type-alias-impl-trait/auto-trait-leakage3.stderr6
-rw-r--r--tests/ui/type-alias-impl-trait/inference-cycle.rs4
-rw-r--r--tests/ui/type-alias-impl-trait/inference-cycle.stderr6
4 files changed, 9 insertions, 9 deletions
diff --git a/tests/ui/type-alias-impl-trait/auto-trait-leakage3.rs b/tests/ui/type-alias-impl-trait/auto-trait-leakage3.rs
index 5fb7a9473d3..43cd49d6ed7 100644
--- a/tests/ui/type-alias-impl-trait/auto-trait-leakage3.rs
+++ b/tests/ui/type-alias-impl-trait/auto-trait-leakage3.rs
@@ -4,7 +4,7 @@
 // FIXME This should compile, but it currently doesn't
 
 mod m {
-    type Foo = impl std::fmt::Debug;
+    pub type Foo = impl std::fmt::Debug;
     //~^ ERROR: cycle detected when computing type of `m::Foo::{opaque#0}` [E0391]
 
     pub fn foo() -> Foo {
diff --git a/tests/ui/type-alias-impl-trait/auto-trait-leakage3.stderr b/tests/ui/type-alias-impl-trait/auto-trait-leakage3.stderr
index 1e9a45aac79..6df59d98150 100644
--- a/tests/ui/type-alias-impl-trait/auto-trait-leakage3.stderr
+++ b/tests/ui/type-alias-impl-trait/auto-trait-leakage3.stderr
@@ -1,8 +1,8 @@
 error[E0391]: cycle detected when computing type of `m::Foo::{opaque#0}`
-  --> $DIR/auto-trait-leakage3.rs:7:16
+  --> $DIR/auto-trait-leakage3.rs:7:20
    |
-LL |     type Foo = impl std::fmt::Debug;
-   |                ^^^^^^^^^^^^^^^^^^^^
+LL |     pub type Foo = impl std::fmt::Debug;
+   |                    ^^^^^^^^^^^^^^^^^^^^
    |
 note: ...which requires type-checking `m::bar`...
   --> $DIR/auto-trait-leakage3.rs:15:9
diff --git a/tests/ui/type-alias-impl-trait/inference-cycle.rs b/tests/ui/type-alias-impl-trait/inference-cycle.rs
index 79caddf7913..01a4b9c0bb8 100644
--- a/tests/ui/type-alias-impl-trait/inference-cycle.rs
+++ b/tests/ui/type-alias-impl-trait/inference-cycle.rs
@@ -2,7 +2,7 @@
 #![allow(dead_code)]
 
 mod m {
-    type Foo = impl std::fmt::Debug;
+    pub type Foo = impl std::fmt::Debug;
     //~^ ERROR cycle detected
 
     // Cycle: error today, but it'd be nice if it eventually worked
@@ -16,7 +16,7 @@ mod m {
     }
 
     fn baz() {
-        let f: Foo = 22_u32;
+        let f: Foo = ();
     }
 
     fn is_send<T: Send>(_: T) {}
diff --git a/tests/ui/type-alias-impl-trait/inference-cycle.stderr b/tests/ui/type-alias-impl-trait/inference-cycle.stderr
index b9d646b927a..03ffe38ba2e 100644
--- a/tests/ui/type-alias-impl-trait/inference-cycle.stderr
+++ b/tests/ui/type-alias-impl-trait/inference-cycle.stderr
@@ -1,8 +1,8 @@
 error[E0391]: cycle detected when computing type of `m::Foo::{opaque#0}`
-  --> $DIR/inference-cycle.rs:5:16
+  --> $DIR/inference-cycle.rs:5:20
    |
-LL |     type Foo = impl std::fmt::Debug;
-   |                ^^^^^^^^^^^^^^^^^^^^
+LL |     pub type Foo = impl std::fmt::Debug;
+   |                    ^^^^^^^^^^^^^^^^^^^^
    |
 note: ...which requires type-checking `m::bar`...
   --> $DIR/inference-cycle.rs:15:9