use "function" rather than "fn pointer" in diagnostic message

Resolves rust-lang#80929.

Author: zackmdavis

compiler/rustc_middle/src/ty/error.rs

@@ -261,7 +261,7 @@ impl<'tcx> ty::TyS<'tcx> {
                 }
             }
             ty::FnDef(..) => "fn item".into(),
-            ty::FnPtr(_) => "fn pointer".into(),
+            ty::FnPtr(_) => "functionr".into(),
             ty::Dynamic(ref inner, ..) => {
                 if let Some(principal) = inner.principal() {
                     format!("trait object `dyn {}`", tcx.def_path_str(principal.def_id())).into()

src/test/ui/closures/closure-no-fn-1.stderr

@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/closure-no-fn-1.rs:6:29
    |
 LL |     let foo: fn(u8) -> u8 = |v: u8| { a += v; a };
-   |              ------------   ^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found closure
+   |              ------------   ^^^^^^^^^^^^^^^^^^^^^ expected functionr, found closure
    |              |
    |              expected due to this
    |

src/test/ui/closures/closure-no-fn-2.stderr

@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/closure-no-fn-2.rs:6:27
    |
 LL |     let bar: fn() -> u8 = || { b };
-   |              ----------   ^^^^^^^^ expected fn pointer, found closure
+   |              ----------   ^^^^^^^^ expected functionr, found closure
    |              |
    |              expected due to this
    |

src/test/ui/closures/closure-no-fn-4.stderr

@@ -6,7 +6,7 @@ LL |       let _: fn(usize) -> usize = match true {
 LL | |         true => |a| a + 1,
    | |                 --------- this is found to be of type `fn(usize) -> usize`
 LL | |         false => |a| a - b,
-   | |                  ^^^^^^^^^ expected fn pointer, found closure
+   | |                  ^^^^^^^^^ expected functionr, found closure
 LL | |
 LL | |     };
    | |_____- `match` arms have incompatible types

src/test/ui/closures/closure-no-fn-5.stderr

@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/closure-no-fn-5.rs:10:27
    |
 LL |     let bar: fn() -> u8 = || { a; b; c; d; e };
-   |              ----------   ^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found closure
+   |              ----------   ^^^^^^^^^^^^^^^^^^^^ expected functionr, found closure
    |              |
    |              expected due to this
    |

src/test/ui/closures/closure-reform-bad.stderr

@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL |     let f = |s: &str| println!("{}{}", s, string);
    |             ------------------------------------- the found closure
 LL |     call_bare(f)
-   |               ^ expected fn pointer, found closure
+   |               ^ expected functionr, found closure
    |
    = note: expected fn pointer `for<'r> fn(&'r str)`
                  found closure `[closure@$DIR/closure-reform-bad.rs:10:13: 10:50]`

src/test/ui/closures/print/closure-print-verbose.stderr

@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/closure-print-verbose.rs:10:29
    |
 LL |     let foo: fn(u8) -> u8 = |v: u8| { a += v; a };
-   |              ------------   ^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found closure
+   |              ------------   ^^^^^^^^^^^^^^^^^^^^^ expected functionr, found closure
    |              |
    |              expected due to this
    |

src/test/ui/fn/fn-item-type.stderr

@@ -50,7 +50,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-item-type.rs:46:19
    |
 LL |     eq(foo::<u8>, bar::<u8> as fn(isize) -> isize);
-   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn item, found fn pointer
+   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn item, found functionr
    |
    = note: expected fn item `fn(_) -> _ {foo::<u8>}`
            found fn pointer `fn(_) -> _`

src/test/ui/issues/issue-24322.stderr

@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-24322.rs:8:29
    |
 LL |     let x: &fn(&B) -> u32 = &B::func;
-   |            --------------   ^^^^^^^^ expected fn pointer, found fn item
+   |            --------------   ^^^^^^^^ expected functionr, found fn item
    |            |
    |            expected due to this
    |

src/test/ui/rfc-2497-if-let-chains/disallowed-positions.stderr

@@ -660,7 +660,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:78:12
    |
 LL |     if let Range { start: F, end } = F..|| true {}
-   |            ^^^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found struct `std::ops::Range`
+   |            ^^^^^^^^^^^^^^^^^^^^^^^ expected functionr, found struct `std::ops::Range`
    |
    = note: expected fn pointer `fn() -> bool`
                   found struct `std::ops::Range<_>`
@@ -848,7 +848,7 @@ error[E0308]: mismatched types
   --> $DIR/disallowed-positions.rs:142:15
    |
 LL |     while let Range { start: F, end } = F..|| true {}
-   |               ^^^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found struct `std::ops::Range`
+   |               ^^^^^^^^^^^^^^^^^^^^^^^ expected functionr, found struct `std::ops::Range`
    |
    = note: expected fn pointer `fn() -> bool`
                   found struct `std::ops::Range<_>`

src/test/ui/static/static-reference-to-fn-1.stderr

@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/static-reference-to-fn-1.rs:17:15
    |
 LL |         func: &foo,
-   |               ^^^^ expected fn pointer, found fn item
+   |               ^^^^ expected functionr, found fn item
    |
    = note: expected reference `&fn() -> Option<isize>`
               found reference `&fn() -> Option<isize> {foo}`