diff options
Diffstat (limited to 'tests/ui/nll/relate_tys')
| -rw-r--r-- | tests/ui/nll/relate_tys/fn-subtype.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr | 8 | ||||
| -rw-r--r-- | tests/ui/nll/relate_tys/opaque-hrtb.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/nll/relate_tys/trait-hrtb.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/nll/relate_tys/universe-violation.stderr | 6 | ||||
| -rw-r--r-- | tests/ui/nll/relate_tys/var-appears-twice.stderr | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/tests/ui/nll/relate_tys/fn-subtype.stderr b/tests/ui/nll/relate_tys/fn-subtype.stderr index 21073647e..0e3ab41da 100644 --- a/tests/ui/nll/relate_tys/fn-subtype.stderr +++ b/tests/ui/nll/relate_tys/fn-subtype.stderr @@ -7,6 +7,6 @@ LL | let y: for<'a> fn(&'a ()) = x; = note: expected fn pointer `for<'a> fn(&'a ())` found fn pointer `fn(&())` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0308`. diff --git a/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr index 7d76c916d..58fd7776f 100644 --- a/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr +++ b/tests/ui/nll/relate_tys/hr-fn-aaa-as-aba.stderr @@ -4,8 +4,8 @@ error[E0308]: mismatched types LL | let a: for<'a, 'b> fn(&'a u32, &'b u32) -> &'a u32 = make_it(); | ^^^^^^^^^ one type is more general than the other | - = note: expected fn pointer `for<'a, 'b> fn(&'a u32, &'b u32) -> &'a u32` - found fn pointer `for<'a> fn(&'a u32, &'a u32) -> &'a u32` + = note: expected fn pointer `for<'a, 'b> fn(&'a _, &'b _) -> &'a _` + found fn pointer `for<'a> fn(&'a _, &'a _) -> &'a _` error[E0308]: mismatched types --> $DIR/hr-fn-aaa-as-aba.rs:20:12 @@ -13,8 +13,8 @@ error[E0308]: mismatched types LL | let _: for<'a, 'b> fn(&'a u32, &'b u32) -> &'a u32 = make_it(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ one type is more general than the other | - = note: expected fn pointer `for<'a, 'b> fn(&'a u32, &'b u32) -> &'a u32` - found fn pointer `for<'a> fn(&'a u32, &'a u32) -> &'a u32` + = note: expected fn pointer `for<'a, 'b> fn(&'a _, &'b _) -> &'a _` + found fn pointer `for<'a> fn(&'a _, &'a _) -> &'a _` error: aborting due to 2 previous errors diff --git a/tests/ui/nll/relate_tys/opaque-hrtb.stderr b/tests/ui/nll/relate_tys/opaque-hrtb.stderr index d75ec2b57..d48745d2d 100644 --- a/tests/ui/nll/relate_tys/opaque-hrtb.stderr +++ b/tests/ui/nll/relate_tys/opaque-hrtb.stderr @@ -7,5 +7,5 @@ LL | bar() = note: `impl MyTrait<&'2 str>` must implement `MyTrait<&'1 str>`, for any lifetime `'1`... = note: ...but it actually implements `MyTrait<&'2 str>`, for some specific lifetime `'2` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/nll/relate_tys/trait-hrtb.stderr b/tests/ui/nll/relate_tys/trait-hrtb.stderr index aa1927711..7f7b94c0b 100644 --- a/tests/ui/nll/relate_tys/trait-hrtb.stderr +++ b/tests/ui/nll/relate_tys/trait-hrtb.stderr @@ -7,6 +7,6 @@ LL | let y: Box<dyn for<'a> Foo<'a>> = x; = note: expected trait object `dyn for<'a> Foo<'a>` found trait object `dyn Foo<'_>` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0308`. diff --git a/tests/ui/nll/relate_tys/universe-violation.stderr b/tests/ui/nll/relate_tys/universe-violation.stderr index fe801b42c..a538a59a4 100644 --- a/tests/ui/nll/relate_tys/universe-violation.stderr +++ b/tests/ui/nll/relate_tys/universe-violation.stderr @@ -4,9 +4,9 @@ error[E0308]: mismatched types LL | let b: fn(&u32) -> &u32 = a; | ^ one type is more general than the other | - = note: expected fn pointer `for<'a> fn(&'a u32) -> &'a u32` - found fn pointer `fn(&u32) -> &u32` + = note: expected fn pointer `for<'a> fn(&'a _) -> &'a _` + found fn pointer `fn(&_) -> &_` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0308`. diff --git a/tests/ui/nll/relate_tys/var-appears-twice.stderr b/tests/ui/nll/relate_tys/var-appears-twice.stderr index ff6ea598f..3f9a6cec0 100644 --- a/tests/ui/nll/relate_tys/var-appears-twice.stderr +++ b/tests/ui/nll/relate_tys/var-appears-twice.stderr @@ -12,6 +12,6 @@ LL | let x: DoubleCell<_> = make_cell(&b); LL | } | - `b` dropped here while still borrowed -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0597`. |