review comments: wording

estebank · estebank · commit 8a9a5a3f78d2 · 2020-01-30T10:43:05.000-08:00
diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
@@ -1509,7 +1509,7 @@ crate fn add_missing_lifetime_specifiers_label(
                         );
                         should_break = false;
                         err.note(
-                            "for more information on higher-ranked lifetimes, visit \
+                            "for more information on higher-ranked polymorphism, visit \
                              https://doc.rust-lang.org/nomicon/hrtb.html",
                         );
                         let suggestion = match span_type {
diff --git a/src/librustc_resolve/lifetimes.rs b/src/librustc_resolve/lifetimes.rs
@@ -1913,7 +1913,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
                             Applicability::MaybeIncorrect,
                         );
                         err.note(
-                            "for more information on higher-ranked lifetimes, visit \
+                            "for more information on higher-ranked polymorphism, visit \
                              https://doc.rust-lang.org/nomicon/hrtb.html",
                         );
                     }
diff --git a/src/test/ui/generic/generic-extern-lifetime.stderr b/src/test/ui/generic/generic-extern-lifetime.stderr
@@ -10,7 +10,7 @@ error[E0261]: use of undeclared lifetime name `'a`
 LL |    pub fn life4<'b>(x: for<'c> fn(&'a i32));
    |                                    ^^ undeclared lifetime
    |
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider making the type lifetime-generic with a new `'a` lifetime
    |
 LL |    pub fn life4<'b>(x: for<'c, 'a> fn(&'a i32));
@@ -22,7 +22,7 @@ error[E0261]: use of undeclared lifetime name `'a`
 LL |    pub fn life7<'b>() -> for<'c> fn(&'a i32);
    |                                      ^^ undeclared lifetime
    |
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider making the type lifetime-generic with a new `'a` lifetime
    |
 LL |    pub fn life7<'b>() -> for<'c, 'a> fn(&'a i32);
diff --git a/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr b/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr
@@ -12,7 +12,7 @@ error[E0261]: use of undeclared lifetime name `'test`
 LL |     let y: fn(&'test u32) = foo2;
    |                ^^^^^ undeclared lifetime
    |
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider introducing lifetime `'test` here
    |
 LL | fn bar<'test>() {
diff --git a/src/test/ui/issues/issue-19707.stderr b/src/test/ui/issues/issue-19707.stderr
@@ -5,7 +5,7 @@ LL | type Foo = fn(&u8, &u8) -> &u8;
    |               ---  ---     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider making the type lifetime-generic with a new `'a` lifetime
    |
 LL | type Foo = for<'a> fn(&'a u8, &'a u8) -> &'a u8;
@@ -22,7 +22,7 @@ LL | fn bar<F: Fn(&u8, &u8) -> &u8>(f: &F) {}
    |              ---  ---     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider making the bound lifetime-generic with a new `'a` lifetime
    |
 LL | fn bar<F: for<'a> Fn(&'a u8, &'a u8) -> &'a u8>(f: &F) {}
diff --git a/src/test/ui/regions/regions-name-undeclared.stderr b/src/test/ui/regions/regions-name-undeclared.stderr
@@ -89,7 +89,7 @@ error[E0261]: use of undeclared lifetime name `'b`
 LL | ...                   &'b isize,
    |                        ^^ undeclared lifetime
    |
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider introducing lifetime `'b` here
    |
 LL | fn fn_types<'b>(a: &'a isize,
@@ -105,7 +105,7 @@ error[E0261]: use of undeclared lifetime name `'b`
 LL | ...                   &'b isize)>,
    |                        ^^ undeclared lifetime
    |
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider introducing lifetime `'b` here
    |
 LL | fn fn_types<'b>(a: &'a isize,
diff --git a/src/test/ui/rfc1623-2.stderr b/src/test/ui/rfc1623-2.stderr
@@ -5,7 +5,7 @@ LL | static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 =
    |                             ---  ---     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider making the type lifetime-generic with a new `'a` lifetime
    |
 LL | static NON_ELIDABLE_FN: &for<'a> fn(&'a u8, &'a u8) -> &'a u8 =
@@ -18,7 +18,7 @@ LL |     &(non_elidable as fn(&u8, &u8) -> &u8);
    |                          ---  ---     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider making the type lifetime-generic with a new `'a` lifetime
    |
 LL |     &(non_elidable as for<'a> fn(&'a u8, &'a u8) -> &'a u8);
diff --git a/src/test/ui/suggestions/fn-missing-lifetime-in-item.stderr b/src/test/ui/suggestions/fn-missing-lifetime-in-item.stderr
@@ -4,7 +4,7 @@ error[E0261]: use of undeclared lifetime name `'a`
 LL | struct S1<F: Fn(&i32, &i32) -> &'a i32>(F);
    |                                 ^^ undeclared lifetime
    |
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider introducing lifetime `'a` here
    |
 LL | struct S1<'a, F: Fn(&i32, &i32) -> &'a i32>(F);
@@ -21,7 +21,7 @@ LL | struct S2<F: Fn(&i32, &i32) -> &i32>(F);
    |                 ----  ----     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
-   = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
 help: consider making the bound lifetime-generic with a new `'a` lifetime
    |
 LL | struct S2<F: for<'a> Fn(&'a i32, &'a i32) -> &'a i32>(F);

Original file line number	Diff line number	Diff line change
`@@ -1913,7 +1913,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {`
`1913`	`1913`	`Applicability::MaybeIncorrect,`
`1914`	`1914`	`);`
`1915`	`1915`	`err.note(`
`1916`		`- "for more information on higher-ranked lifetimes, visit \`
	`1916`	`+ "for more information on higher-ranked polymorphism, visit \`
`1917`	`1917`	`https://doc.rust-lang.org/nomicon/hrtb.html",`
`1918`	`1918`	`);`
`1919`	`1919`	`}`
Original file line number	Diff line number	Diff line change
@@ -10,7 +10,7 @@ error[E0261]: use of undeclared lifetime name `'a`
`10`	`10`	`LL \| pub fn life4<'b>(x: for<'c> fn(&'a i32));`
`11`	`11`	`\| ^^ undeclared lifetime`
`12`	`12`	`\|`
`13`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`13`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`14`	`14`	help: consider making the type lifetime-generic with a new `'a` lifetime
`15`	`15`	`\|`
`16`	`16`	`LL \| pub fn life4<'b>(x: for<'c, 'a> fn(&'a i32));`
@@ -22,7 +22,7 @@ error[E0261]: use of undeclared lifetime name `'a`
`22`	`22`	`LL \| pub fn life7<'b>() -> for<'c> fn(&'a i32);`
`23`	`23`	`\| ^^ undeclared lifetime`
`24`	`24`	`\|`
`25`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`25`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`26`	`26`	help: consider making the type lifetime-generic with a new `'a` lifetime
`27`	`27`	`\|`
`28`	`28`	`LL \| pub fn life7<'b>() -> for<'c, 'a> fn(&'a i32);`
Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ error[E0261]: use of undeclared lifetime name `'test`
`12`	`12`	`LL \| let y: fn(&'test u32) = foo2;`
`13`	`13`	`\| ^^^^^ undeclared lifetime`
`14`	`14`	`\|`
`15`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`15`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`16`	`16`	help: consider introducing lifetime `'test` here
`17`	`17`	`\|`
`18`	`18`	`LL \| fn bar<'test>() {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| type Foo = fn(&u8, &u8) -> &u8;`
`5`	`5`	`\| --- --- ^ expected named lifetime parameter`
`6`	`6`	`\|`
`7`	`7`	`= help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2`
`8`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`8`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`9`	`9`	help: consider making the type lifetime-generic with a new `'a` lifetime
`10`	`10`	`\|`
`11`	`11`	`LL \| type Foo = for<'a> fn(&'a u8, &'a u8) -> &'a u8;`
`@@ -22,7 +22,7 @@ LL \| fn bar<F: Fn(&u8, &u8) -> &u8>(f: &F) {}`
`22`	`22`	`\| --- --- ^ expected named lifetime parameter`
`23`	`23`	`\|`
`24`	`24`	`= help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2`
`25`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`25`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`26`	`26`	help: consider making the bound lifetime-generic with a new `'a` lifetime
`27`	`27`	`\|`
`28`	`28`	`LL \| fn bar<F: for<'a> Fn(&'a u8, &'a u8) -> &'a u8>(f: &F) {}`
Original file line number	Diff line number	Diff line change
@@ -89,7 +89,7 @@ error[E0261]: use of undeclared lifetime name `'b`
`89`	`89`	`LL \| ... &'b isize,`
`90`	`90`	`\| ^^ undeclared lifetime`
`91`	`91`	`\|`
`92`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`92`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`93`	`93`	help: consider introducing lifetime `'b` here
`94`	`94`	`\|`
`95`	`95`	`LL \| fn fn_types<'b>(a: &'a isize,`
@@ -105,7 +105,7 @@ error[E0261]: use of undeclared lifetime name `'b`
`105`	`105`	`LL \| ... &'b isize)>,`
`106`	`106`	`\| ^^ undeclared lifetime`
`107`	`107`	`\|`
`108`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`108`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`109`	`109`	help: consider introducing lifetime `'b` here
`110`	`110`	`\|`
`111`	`111`	`LL \| fn fn_types<'b>(a: &'a isize,`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 =`
`5`	`5`	`\| --- --- ^ expected named lifetime parameter`
`6`	`6`	`\|`
`7`	`7`	`= help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2`
`8`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`8`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`9`	`9`	help: consider making the type lifetime-generic with a new `'a` lifetime
`10`	`10`	`\|`
`11`	`11`	`LL \| static NON_ELIDABLE_FN: &for<'a> fn(&'a u8, &'a u8) -> &'a u8 =`
`@@ -18,7 +18,7 @@ LL \| &(non_elidable as fn(&u8, &u8) -> &u8);`
`18`	`18`	`\| --- --- ^ expected named lifetime parameter`
`19`	`19`	`\|`
`20`	`20`	`= help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2`
`21`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`21`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`22`	`22`	help: consider making the type lifetime-generic with a new `'a` lifetime
`23`	`23`	`\|`
`24`	`24`	`LL \| &(non_elidable as for<'a> fn(&'a u8, &'a u8) -> &'a u8);`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0261]: use of undeclared lifetime name `'a`
`4`	`4`	`LL \| struct S1<F: Fn(&i32, &i32) -> &'a i32>(F);`
`5`	`5`	`\| ^^ undeclared lifetime`
`6`	`6`	`\|`
`7`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`7`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`8`	`8`	help: consider introducing lifetime `'a` here
`9`	`9`	`\|`
`10`	`10`	`LL \| struct S1<'a, F: Fn(&i32, &i32) -> &'a i32>(F);`
`@@ -21,7 +21,7 @@ LL \| struct S2<F: Fn(&i32, &i32) -> &i32>(F);`
`21`	`21`	`\| ---- ---- ^ expected named lifetime parameter`
`22`	`22`	`\|`
`23`	`23`	`= help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2`
`24`		`- = note: for more information on higher-ranked lifetimes, visit https://doc.rust-lang.org/nomicon/hrtb.html`
	`24`	`+ = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html`
`25`	`25`	help: consider making the bound lifetime-generic with a new `'a` lifetime
`26`	`26`	`\|`
`27`	`27`	`LL \| struct S2<F: for<'a> Fn(&'a i32, &'a i32) -> &'a i32>(F);`