Simplify test.

Removes unnecessary type mismatch error from test that was hiding
borrow check error from NLL stderr.

diff --git a/src/test/ui/issues/issue-13058.nll.stderr b/src/test/ui/issues/issue-13058.nll.stderr
index 33c0eefbfaa289758d5a0a1d81b20e3d5750b64a..0d641ec8e891ad150a7b8d85a42291311cc364d9 100644 (file)
--- a/src/test/ui/issues/issue-13058.nll.stderr
+++ b/src/test/ui/issues/issue-13058.nll.stderr
@@ -1,15 +1,12 @@
-error[E0308]: mismatched types
-  --> $DIR/issue-13058.rs:36:11
+error[E0621]: explicit lifetime required in the type of `cont`
+  --> $DIR/issue-13058.rs:24:21
    |
-LL |     check((3, 5));
-   |           ^^^^^^
-   |           |
-   |           expected reference, found tuple
-   |           help: consider borrowing here: `&(3, 5)`
-   |
-   = note: expected type `&_`
-              found type `({integer}, {integer})`
+LL | fn check<'r, I: Iterator<Item=usize>, T: Itble<'r, usize, I>>(cont: &T) -> bool
+   |                                                                     -- help: add explicit lifetime `'r` to the type of `cont`: `&'r T`
+LL | {
+LL |     let cont_iter = cont.iter();
+   |                     ^^^^^^^^^^^ lifetime `'r` required
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0308`.
+For more information about this error, try `rustc --explain E0621`.

diff --git a/src/test/ui/issues/issue-13058.rs b/src/test/ui/issues/issue-13058.rs
index dbcf9998ad937c6956ff6f7e89141306ef48d92c..cabf02194776a1bde47e6575df8be52be5d774d4 100644 (file)
--- a/src/test/ui/issues/issue-13058.rs
+++ b/src/test/ui/issues/issue-13058.rs
@@ -33,6 +33,5 @@ fn check<'r, I: Iterator<Item=usize>, T: Itble<'r, usize, I>>(cont: &T) -> bool
 }
 
 fn main() {
-    check((3, 5));
-//~^ ERROR mismatched types
+    check(&(3, 5));
 }

diff --git a/src/test/ui/issues/issue-13058.stderr b/src/test/ui/issues/issue-13058.stderr
index 5e8319d26ad3ca42ba3277d07f7d35e619934535..ee39678736cddaeed08d61593e9355206735d818 100644 (file)
--- a/src/test/ui/issues/issue-13058.stderr
+++ b/src/test/ui/issues/issue-13058.stderr
@@ -7,19 +7,6 @@ LL | {
 LL |     let cont_iter = cont.iter();
    |                          ^^^^ lifetime `'r` required
 
-error[E0308]: mismatched types
-  --> $DIR/issue-13058.rs:36:11
-   |
-LL |     check((3, 5));
-   |           ^^^^^^
-   |           |
-   |           expected reference, found tuple
-   |           help: consider borrowing here: `&(3, 5)`
-   |
-   = note: expected type `&_`
-              found type `({integer}, {integer})`
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-Some errors occurred: E0308, E0621.
-For more information about an error, try `rustc --explain E0308`.
+For more information about this error, try `rustc --explain E0621`.