mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename some suggestion/note functions

Browse source 
We really shouldn't be naming functions `fn check_*` unless they're
doing *typechecking*. It's especially misleading when we're doing this
inside of HIR typeck.
This commit is contained in:
Michael Goulet 2023-04-18 19:51:33 +00:00
parent a9051d861c
commit a283f58183
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_hir_typeck/src/demand.rs
View file

@ -86,9 +86,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
self.emit_type_mismatch_suggestions(err, expr, expr_ty, expected, expected_ty_expr, error); self.emit_type_mismatch_suggestions(err, expr, expr_ty, expected, expected_ty_expr, error);
self.note_type_is_not_clone(err, expected, expr_ty, expr); self.note_type_is_not_clone(err, expected, expr_ty, expr);
self.note_internal_mutation_in_method(err, expr, Some(expected), expr_ty); self.note_internal_mutation_in_method(err, expr, Some(expected), expr_ty);
self.check_for_range_as_method_call(err, expr, expr_ty, expected); self.suggest_method_call_on_range_literal(err, expr, expr_ty, expected);
self.check_for_binding_assigned_block_without_tail_expression(err, expr, expr_ty, expected); self.suggest_return_binding_for_missing_tail_expr(err, expr, expr_ty, expected);
self.check_wrong_return_type_due_to_generic_arg(err, expr, expr_ty); self.note_wrong_return_ty_due_to_generic_arg(err, expr, expr_ty);
} }
/// Requires that the two types unify, and prints an error message if /// Requires that the two types unify, and prints an error message if
@ -1217,7 +1217,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
/// In addition of this check, it also checks between references mutability state. If the /// In addition of this check, it also checks between references mutability state. If the
/// expected is mutable but the provided isn't, maybe we could just say "Hey, try with /// expected is mutable but the provided isn't, maybe we could just say "Hey, try with
/// `&mut`!". /// `&mut`!".
pub fn check_ref( pub fn suggest_deref_or_ref(
&self, &self,
expr: &hir::Expr<'tcx>, expr: &hir::Expr<'tcx>,
checked_ty: Ty<'tcx>, checked_ty: Ty<'tcx>,
@ -1572,7 +1572,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
None None
} }
pub fn check_for_cast( pub fn suggest_cast(
&self, &self,
err: &mut Diagnostic, err: &mut Diagnostic,
expr: &hir::Expr<'_>, expr: &hir::Expr<'_>,
@ -1939,7 +1939,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
/// Identify when the user has written `foo..bar()` instead of `foo.bar()`. /// Identify when the user has written `foo..bar()` instead of `foo.bar()`.
pub fn check_for_range_as_method_call( pub fn suggest_method_call_on_range_literal(
&self, &self,
err: &mut Diagnostic, err: &mut Diagnostic,
expr: &hir::Expr<'tcx>, expr: &hir::Expr<'tcx>,
@ -2008,7 +2008,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
/// Identify when the type error is because `()` is found in a binding that was assigned a /// Identify when the type error is because `()` is found in a binding that was assigned a
/// block without a tail expression. /// block without a tail expression.
fn check_for_binding_assigned_block_without_tail_expression( fn suggest_return_binding_for_missing_tail_expr(
&self, &self,
err: &mut Diagnostic, err: &mut Diagnostic,
expr: &hir::Expr<'_>, expr: &hir::Expr<'_>,
@ -2050,7 +2050,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
} }
fn check_wrong_return_type_due_to_generic_arg( fn note_wrong_return_ty_due_to_generic_arg(
&self, &self,
err: &mut Diagnostic, err: &mut Diagnostic,
expr: &hir::Expr<'_>, expr: &hir::Expr<'_>,

4
compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
View file

@ -275,7 +275,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
) -> bool { ) -> bool {
let expr = expr.peel_blocks(); let expr = expr.peel_blocks();
if let Some((sp, msg, suggestion, applicability, verbose, annotation)) = if let Some((sp, msg, suggestion, applicability, verbose, annotation)) =
self.check_ref(expr, found, expected) self.suggest_deref_or_ref(expr, found, expected)
{ {
if verbose { if verbose {
err.span_suggestion_verbose(sp, msg, suggestion, applicability); err.span_suggestion_verbose(sp, msg, suggestion, applicability);
@ -342,7 +342,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_label(sp, format!("{descr} `{name}` defined here")); err.span_label(sp, format!("{descr} `{name}` defined here"));
} }
return true; return true;
} else if self.check_for_cast(err, expr, found, expected, expected_ty_expr) { } else if self.suggest_cast(err, expr, found, expected, expected_ty_expr) {
return true; return true;
} else { } else {
let methods = self.get_conversion_methods(expr.span, expected, found, expr.hir_id); let methods = self.get_conversion_methods(expr.span, expected, found, expr.hir_id);

8
compiler/rustc_hir_typeck/src/method/suggest.rs
View file

@ -1045,7 +1045,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
); );
} }
self.check_for_inner_self(&mut err, source, rcvr_ty, item_name); self.suggest_unwrapping_inner_self(&mut err, source, rcvr_ty, item_name);
bound_spans.sort(); bound_spans.sort();
bound_spans.dedup(); bound_spans.dedup();
@ -1132,7 +1132,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
} }
self.check_for_deref_method(&mut err, source, rcvr_ty, item_name, expected); self.note_derefed_ty_has_method(&mut err, source, rcvr_ty, item_name, expected);
return Some(err); return Some(err);
} }
@ -1805,7 +1805,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
} }
fn check_for_inner_self( fn suggest_unwrapping_inner_self(
&self, &self,
err: &mut Diagnostic, err: &mut Diagnostic,
source: SelfSource<'tcx>, source: SelfSource<'tcx>,
@ -2175,7 +2175,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
} }
fn check_for_deref_method( fn note_derefed_ty_has_method(
&self, &self,
err: &mut Diagnostic, err: &mut Diagnostic,
self_source: SelfSource<'tcx>, self_source: SelfSource<'tcx>,