From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr | 2 +- tests/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr | 2 +- tests/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr | 2 +- .../two-uses-in-inherent-method-argument-and-return.stderr | 2 +- tests/ui/single-use-lifetime/zero-uses-in-impl.stderr | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/ui/single-use-lifetime') diff --git a/tests/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr b/tests/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr index 94129560f..e151269d7 100644 --- a/tests/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr +++ b/tests/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr @@ -17,5 +17,5 @@ LL - impl<'f> Foo<'f> { LL + impl Foo<'_> { | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr b/tests/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr index 69578fe2f..bc86e36f3 100644 --- a/tests/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr +++ b/tests/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr @@ -17,5 +17,5 @@ LL - impl<'f> Foo<'f> { LL + impl Foo<'_> { | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr b/tests/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr index 1a6e8310d..0e67180a8 100644 --- a/tests/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr +++ b/tests/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr @@ -17,5 +17,5 @@ LL - fn next<'g>(&'g mut self) -> Option { LL + fn next(&mut self) -> Option { | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr b/tests/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr index 4794566ea..4cc46524a 100644 --- a/tests/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr +++ b/tests/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr @@ -17,5 +17,5 @@ LL - impl<'f> Foo<'f> { LL + impl Foo<'_> { | -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/single-use-lifetime/zero-uses-in-impl.stderr b/tests/ui/single-use-lifetime/zero-uses-in-impl.stderr index b6e42d3e7..554a19afb 100644 --- a/tests/ui/single-use-lifetime/zero-uses-in-impl.stderr +++ b/tests/ui/single-use-lifetime/zero-uses-in-impl.stderr @@ -10,5 +10,5 @@ note: the lint level is defined here LL | #![deny(unused_lifetimes)] | ^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error -- cgit v1.2.3