diff options
| author | David Wood <david@davidtw.co> | 2018-10-05 18:35:23 +0200 |
|---|---|---|
| committer | David Wood <david@davidtw.co> | 2018-10-05 18:35:23 +0200 |
| commit | c07b712d2c9cb4559a06cf390f0c447ece758718 (patch) | |
| tree | e53da9cf4d865f988e5077aae7f1b3f4de0bca6c | |
| parent | 60c846046ec26c9e5c1216a6e118cc2e69a2956c (diff) | |
Simplify test.
Removes unnecessary type mismatch error from test that was hiding borrow check error from NLL stderr.
| -rw-r--r-- | src/test/ui/issues/issue-13058.nll.stderr | 19 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-13058.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-13058.stderr | 17 |
3 files changed, 11 insertions, 28 deletions
diff --git a/src/test/ui/issues/issue-13058.nll.stderr b/src/test/ui/issues/issue-13058.nll.stderr index 33c0eefbfaa..0d641ec8e89 100644 --- 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 dbcf9998ad9..cabf0219477 100644 --- 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 5e8319d26ad..ee39678736c 100644 --- 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`. |