bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

review comment: remove unnused return value

Browse source
This commit is contained in:
Esteban Küber 2024-02-14 19:27:53 +00:00
parent fdaaaa1951
commit d67dcf5a8b
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
View file

@ -563,8 +563,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}; };
let suggest_confusable = |err: &mut Diagnostic| { let suggest_confusable = |err: &mut Diagnostic| {
let call_name = call_ident?; let Some(call_name) = call_ident else {
let callee_ty = callee_ty?; return;
};
let Some(callee_ty) = callee_ty else {
return;
};
let input_types: Vec<Ty<'_>> = provided_arg_tys.iter().map(|(ty, _)| *ty).collect(); let input_types: Vec<Ty<'_>> = provided_arg_tys.iter().map(|(ty, _)| *ty).collect();
// Check for other methods in the following order // Check for other methods in the following order
// - methods marked as `rustc_confusables` with the provided arguments // - methods marked as `rustc_confusables` with the provided arguments
@ -573,13 +577,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// - methods with short levenshtein distance // - methods with short levenshtein distance
// Look for commonly confusable method names considering arguments. // Look for commonly confusable method names considering arguments.
if let Some(name) = self.confusable_method_name( if let Some(_name) = self.confusable_method_name(
err, err,
callee_ty.peel_refs(), callee_ty.peel_refs(),
call_name, call_name,
Some(input_types.clone()), Some(input_types.clone()),
) { ) {
return Some(name); return;
} }
// Look for method names with short levenshtein distance, considering arguments. // Look for method names with short levenshtein distance, considering arguments.
if let Some((assoc, fn_sig)) = similar_assoc(call_name) if let Some((assoc, fn_sig)) = similar_assoc(call_name)
@ -595,13 +599,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
assoc.name, assoc.name,
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
); );
return Some(assoc.name); return;
} }
// Look for commonly confusable method names disregarding arguments. // Look for commonly confusable method names disregarding arguments.
if let Some(name) = if let Some(_name) =
self.confusable_method_name(err, callee_ty.peel_refs(), call_name, None) self.confusable_method_name(err, callee_ty.peel_refs(), call_name, None)
{ {
return Some(name); return;
} }
// Look for similarly named methods with levenshtein distance with the right // Look for similarly named methods with levenshtein distance with the right
// number of arguments. // number of arguments.
@ -615,7 +619,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
assoc.name, assoc.name,
), ),
); );
return Some(assoc.name); return;
} }
// Fallthrough: look for similarly named methods with levenshtein distance. // Fallthrough: look for similarly named methods with levenshtein distance.
if let Some((assoc, _)) = similar_assoc(call_name) { if let Some((assoc, _)) = similar_assoc(call_name) {
@ -627,9 +631,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
assoc.name, assoc.name,
), ),
); );
return Some(assoc.name); return;
} }
None
}; };
// A "softer" version of the `demand_compatible`, which checks types without persisting them, // A "softer" version of the `demand_compatible`, which checks types without persisting them,
// and treats error types differently // and treats error types differently