about summary refs log tree commit diff
path: root/src/test/ui/regions
diff options
context:
space:
mode:
authorlcnr <rust@lcnr.de>2022-07-08 10:59:35 +0200
committerlcnr <rust@lcnr.de>2022-07-15 16:53:20 +0200
commit5bd8c960f5f7b07128ebdb12e7f788b1ba0a1902 (patch)
treec718862fc57fb9262a09d1593022fe580ba8cddd /src/test/ui/regions
parentb955fa7dd013d04b2a781785d95f76ce1d6d80ee (diff)
downloadrust-5bd8c960f5f7b07128ebdb12e7f788b1ba0a1902.tar.gz
rust-5bd8c960f5f7b07128ebdb12e7f788b1ba0a1902.zip
provide `generic_param_scope` for region errors
Diffstat (limited to 'src/test/ui/regions')
-rw-r--r--src/test/ui/regions/regions-normalize-in-where-clause-list.rs1
-rw-r--r--src/test/ui/regions/regions-normalize-in-where-clause-list.stderr34
2 files changed, 1 insertions, 34 deletions
diff --git a/src/test/ui/regions/regions-normalize-in-where-clause-list.rs b/src/test/ui/regions/regions-normalize-in-where-clause-list.rs
index 9912e88c2ec..389f82e794b 100644
--- a/src/test/ui/regions/regions-normalize-in-where-clause-list.rs
+++ b/src/test/ui/regions/regions-normalize-in-where-clause-list.rs
@@ -23,7 +23,6 @@ where
 // Here we get an error: we need `'a: 'b`.
 fn bar<'a, 'b>()
 //~^ ERROR cannot infer
-//~| ERROR cannot infer
 where
     <() as Project<'a, 'b>>::Item: Eq,
 {
diff --git a/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr b/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr
index 2bb58b5ec2d..5672837290c 100644
--- a/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr
+++ b/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr
@@ -1,36 +1,4 @@
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements
-  --> $DIR/regions-normalize-in-where-clause-list.rs:24:1
-   |
-LL | / fn bar<'a, 'b>()
-LL | |
-LL | |
-LL | | where
-LL | |     <() as Project<'a, 'b>>::Item: Eq,
-   | |______________________________________^
-   |
-note: first, the lifetime cannot outlive the lifetime `'a` as defined here...
-  --> $DIR/regions-normalize-in-where-clause-list.rs:24:8
-   |
-LL | fn bar<'a, 'b>()
-   |        ^^
-note: ...but the lifetime must also be valid for the lifetime `'b` as defined here...
-  --> $DIR/regions-normalize-in-where-clause-list.rs:24:12
-   |
-LL | fn bar<'a, 'b>()
-   |            ^^
-note: ...so that the types are compatible
-  --> $DIR/regions-normalize-in-where-clause-list.rs:24:1
-   |
-LL | / fn bar<'a, 'b>()
-LL | |
-LL | |
-LL | | where
-LL | |     <() as Project<'a, 'b>>::Item: Eq,
-   | |______________________________________^
-   = note: expected `Project<'a, 'b>`
-              found `Project<'_, '_>`
-
-error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements
   --> $DIR/regions-normalize-in-where-clause-list.rs:24:4
    |
 LL | fn bar<'a, 'b>()
@@ -54,6 +22,6 @@ LL | fn bar<'a, 'b>()
    = note: expected `Project<'a, 'b>`
               found `Project<'_, '_>`
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0495`.