user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid trailing commas

Browse source
This commit is contained in:
Esteban Küber 2023-01-01 00:37:24 -08:00
parent fb61f5d781
commit 287cd5974c
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -932,17 +932,17 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
labels
.push((provided_span, format!("argument{} unexpected", provided_ty_name)));
let mut span = provided_span;
if let Some((_, next)) = provided_arg_tys.get(
if arg_idx.index() > 0
&& let Some((_, prev)) = provided_arg_tys
.get(ProvidedIdx::from_usize(arg_idx.index() - 1)
) {
// Include previous comma
span = span.with_lo(prev.hi());
} else if let Some((_, next)) = provided_arg_tys.get(
ProvidedIdx::from_usize(arg_idx.index() + 1),
) {
// Include next comma
span = span.until(*next);
} else if arg_idx.index() > 0
&& let Some((_, prev)) = provided_arg_tys
.get(ProvidedIdx::from_usize(arg_idx.index() - 1)
) {
// Last argument, include previous comma
span = span.with_lo(prev.hi());
}
suggestions.push((span, String::new()));