mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename tuple_wrap_err_subdiag to suggest_wrap_to_build_a_tuple, making it more consistent with similar functions

Browse Source
This commit is contained in:
IQuant 2023-03-11 17:39:14 +03:00
parent 21d5bedd5f
commit 467d367df7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View File

@ -1935,7 +1935,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
// parentheses around it, perhaps the user meant to write `(expr,)` to // parentheses around it, perhaps the user meant to write `(expr,)` to
// build a tuple (issue #86100) // build a tuple (issue #86100)
(ty::Tuple(fields), _) => { (ty::Tuple(fields), _) => {
suggestions.extend(self.tuple_wrap_err_subdiag( span, found, fields)) suggestions.extend(self.suggest_wrap_to_build_a_tuple( span, found, fields))
} }
// If a byte was expected and the found expression is a char literal // If a byte was expected and the found expression is a char literal
// containing a single ASCII character, perhaps the user meant to write `b'c'` to // containing a single ASCII character, perhaps the user meant to write `b'c'` to
@ -1976,7 +1976,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
(ty::Bool, ty::Tuple(list)) => if list.len() == 0 { (ty::Bool, ty::Tuple(list)) => if list.len() == 0 {
suggestions.extend(self.suggest_let_for_letchains(&trace.cause, span)); suggestions.extend(self.suggest_let_for_letchains(&trace.cause, span));
} }
(ty::Array(_, _), ty::Array(_, _)) => suggestions.extend(self.specify_actual_length(terr, trace, span)), (ty::Array(_, _), ty::Array(_, _)) => suggestions.extend(self.suggest_specify_actual_length(terr, trace, span)),
_ => {} _ => {}
} }
} }
@ -1990,7 +1990,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
suggestions suggestions
} }
fn specify_actual_length( fn suggest_specify_actual_length(
&self, &self,
terr: TypeError<'_>, terr: TypeError<'_>,
trace: &TypeTrace<'_>, trace: &TypeTrace<'_>,
@ -2068,7 +2068,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
diag diag
} }
fn tuple_wrap_err_subdiag( fn suggest_wrap_to_build_a_tuple(
&self, &self,
span: Span, span: Span,
found: Ty<'tcx>, found: Ty<'tcx>,