Add a suggestion for the ok_or method

Author: obeis

compiler/rustc_span/src/symbol.rs

@@ -1154,6 +1154,7 @@ symbols! {
         offset_of,
         offset_of_enum,
         offset_of_nested,
+        ok_or,
         ok_or_else,
         omit_gdb_pretty_printer_section,
         on,

compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs

@@ -1155,6 +1155,19 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
                 );
             }
 
+            if path_segment.ident.name == sym::ok_or && is_diagnostic_item(sym::Option, next_ty) {
+                err.span_suggestion(
+                    path_segment.ident.span,
+                    format!(
+                        "`?` expected `{}` for `Err` variant but found `{:?}`. Use the `ok_or_else` method to pass a closure",
+                        self_ty,
+                        get_e_type(prev_ty).unwrap().to_string(),
+                    ),
+                    "ok_or_else",
+                    Applicability::MachineApplicable,
+                );
+            }
+
             prev_ty = next_ty;
 
             if let hir::ExprKind::Path(hir::QPath::Resolved(None, path)) = expr.kind