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

Flatten if-let and match into one.

Browse source
This commit is contained in:
Mara Bos 2022-08-30 17:21:41 +02:00
parent 15754f5ea1
commit 8d9a5881ea
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
compiler/rustc_builtin_macros/src/format.rs
View file

@ -285,26 +285,21 @@ pub fn make_format_args(
-> FormatArgPosition {
let index = match arg {
Index(index) => {
if let Some((_, arg_kind)) = args.get(index) {
match arg_kind {
FormatArgKind::Normal => {
used[index] = true;
Ok(index)
}
FormatArgKind::Named(_) => {
used[index] = true;
numeric_refences_to_named_arg.push((index, span, used_as));
Ok(index)
}
FormatArgKind::Captured(_) => {
// Doesn't exist as an explicit argument.
invalid_refs.push((index, span, used_as, kind));
Err(index)
}
match args.get(index) {
Some((_, FormatArgKind::Normal)) => {
used[index] = true;
Ok(index)
}
Some((_, FormatArgKind::Named(_))) => {
used[index] = true;
numeric_refences_to_named_arg.push((index, span, used_as));
Ok(index)
}
Some((_, FormatArgKind::Captured(_))) | None => {
// Doesn't exist as an explicit argument.
invalid_refs.push((index, span, used_as, kind));
Err(index)
}
} else {
invalid_refs.push((index, span, used_as, kind));
Err(index)
}
}
Name(name, span) => {