Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pluralize hidden lifetime labels

Browse Source
This commit is contained in:
Redddy
2026-03-31 04:15:45 +00:00
parent 25dbba03a2
commit 8cef68aafa
3 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_lint/src/lints.rs
+17 -1
View File
@@ -2,6 +2,7 @@
use std::num::NonZero;
use rustc_data_structures::fx::FxIndexMap;
use rustc_errors::codes::*;
use rustc_errors::formatting::DiagMessageAddArg;
use rustc_errors::{
@@ -3231,8 +3232,23 @@ fn into_diag(self, dcx: DiagCtxtHandle<'a>, level: Level) -> Diag<'a, G> {
diag.span_label(s, msg!("the lifetime is named here"));
}
let mut hidden_output_counts: FxIndexMap<Span, usize> = FxIndexMap::default();
for s in self.outputs.hidden {
diag.span_label(s, msg!("the same lifetime is hidden here"));
*hidden_output_counts.entry(s).or_insert(0) += 1;
}
for (span, count) in hidden_output_counts {
let label = msg!(
"the same {$count ->
[one] lifetime
*[other] lifetimes
} {$count ->
[one] is
*[other] are
} hidden here"
)
.arg("count", count)
.format();
diag.span_label(span, label);
}
for s in self.outputs.elided {
diag.span_label(s, msg!("the same lifetime is elided here"));
tests/ui/lifetimes/mismatched-lifetime-syntaxes-details/macro.stderr
+2 -2
View File
@@ -2,9 +2,9 @@ error: hiding or eliding a lifetime that's named elsewhere is confusing
--> $DIR/macro.rs:10:12
|
LL | ($($pair),+, $middle, $($pair),+)
| ^^^^^ ^^^^^
| ^^^^^ ^^^^^ the same lifetimes are hidden here
| |
| the same lifetime is hidden here
| the same lifetimes are hidden here
...
LL | fn repeated_macro<'a>(x: &'a u8) -> repeated!(Pair, Pair; &'_ u8) {
| -- -----------------------^^----
tests/ui/lifetimes/mismatched-lifetime-syntaxes-details/path-count.stderr
+21 -42
View File
@@ -2,10 +2,8 @@ error: hiding a lifetime that's elided elsewhere is confusing
--> $DIR/path-count.rs:19:15
|
LL | fn missing(_: &str) -> Foo {
| ^^^^ ^^^
| | |
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| ^^^^ ^^^ the same lifetimes are hidden here
| |
| the lifetime is elided here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing
@@ -23,12 +21,9 @@ error: hiding a lifetime that's elided elsewhere is confusing
--> $DIR/path-count.rs:24:22
|
LL | fn missing_double(_: &str) -> (Foo, Foo) {
| ^^^^ ^^^ ^^^
| | | |
| | | the same lifetime is hidden here
| | | the same lifetime is hidden here
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| ^^^^ ^^^ ^^^ the same lifetimes are hidden here
| | |
| | the same lifetimes are hidden here
| the lifetime is elided here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing
@@ -41,10 +36,8 @@ error: hiding a lifetime that's elided elsewhere is confusing
--> $DIR/path-count.rs:29:13
|
LL | fn empty(_: &str) -> Foo<> {
| ^^^^ ^^^^^
| | |
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| ^^^^ ^^^^^ the same lifetimes are hidden here
| |
| the lifetime is elided here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing
@@ -57,10 +50,8 @@ error: hiding a lifetime that's elided elsewhere is confusing
--> $DIR/path-count.rs:34:23
|
LL | fn wrapper_missing(_: &str) -> Wrapper<Foo> {
| ^^^^ ^^^
| | |
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| ^^^^ ^^^ the same lifetimes are hidden here
| |
| the lifetime is elided here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing
@@ -73,10 +64,8 @@ error: hiding a lifetime that's elided elsewhere is confusing
--> $DIR/path-count.rs:39:23
|
LL | fn missing_generic(_: &str) -> Bar<u8> {
| ^^^^ ^^^^^^^
| | |
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| ^^^^ ^^^^^^^ the same lifetimes are hidden here
| |
| the lifetime is elided here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing
@@ -89,10 +78,8 @@ error: hiding a lifetime that's named elsewhere is confusing
--> $DIR/path-count.rs:44:36
|
LL | fn named_missing<'a>(_: &'a u8) -> Foo {
| -- ^^^
| | |
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| -- ^^^ the same lifetimes are hidden here
| |
| the lifetime is named here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing
@@ -105,10 +92,8 @@ error: hiding a lifetime that's named elsewhere is confusing
--> $DIR/path-count.rs:49:34
|
LL | fn named_empty<'a>(_: &'a u8) -> Foo<> {
| -- ^^^^^
| | |
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| -- ^^^^^ the same lifetimes are hidden here
| |
| the lifetime is named here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing
@@ -121,10 +106,8 @@ error: hiding a lifetime that's named elsewhere is confusing
--> $DIR/path-count.rs:54:38
|
LL | fn static_missing(_: &'static u8) -> Foo {
| ------- ^^^
| | |
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| ------- ^^^ the same lifetimes are hidden here
| |
| the lifetime is named here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing
@@ -137,10 +120,8 @@ error: hiding a lifetime that's named elsewhere is confusing
--> $DIR/path-count.rs:59:36
|
LL | fn static_empty(_: &'static u8) -> Foo<> {
| ------- ^^^^^
| | |
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| ------- ^^^^^ the same lifetimes are hidden here
| |
| the lifetime is named here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing
@@ -153,10 +134,8 @@ error: hiding a lifetime that's named elsewhere is confusing
--> $DIR/path-count.rs:64:47
|
LL | fn static_missing_generic(_: &'static str) -> Bar<u8> {
| ------- ^^^^^^^
| | |
| | the same lifetime is hidden here
| | the same lifetime is hidden here
| ------- ^^^^^^^ the same lifetimes are hidden here
| |
| the lifetime is named here
|
= help: the same lifetime is referred to in inconsistent ways, making the signature confusing