Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite and refactor format_args!() builtin macro. #100996

Merged
merged 14 commits into from
Sep 28, 2022
Merged

Rewrite and refactor format_args!() builtin macro. #100996

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9bec0de
Rewrite and refactor format_args!() builtin macro.
m-ou-se Aug 8, 2022
3ffcb65
Update tests.
m-ou-se Aug 26, 2022
8efc383
Move FormatArgs structure to its own module.
m-ou-se Aug 26, 2022
0007492
Fix typo.
m-ou-se Aug 26, 2022
ae238ef
Prefer new_v1_formatted instead of new_v1 with duplicates.
m-ou-se Aug 27, 2022
e65c96e
Tweak comments.
m-ou-se Aug 27, 2022
df7fd11
Use if let chain.
m-ou-se Aug 30, 2022
15754f5
Move enum definition closer to its usage.
m-ou-se Aug 30, 2022
8d9a588
Flatten if-let and match into one.
m-ou-se Aug 30, 2022
c1c6e3a
Add clarifying comments.
m-ou-se Aug 30, 2022
1406563
Update test.
m-ou-se Sep 6, 2022
cf53fef
Turn format arguments Vec into its own struct.
m-ou-se Sep 6, 2022
ba7bf1d
Update doc comments.
m-ou-se Sep 6, 2022
20bb600
Remove confusing drop.
m-ou-se Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Flatten if-let and match into one.
  • Loading branch information
@m-ou-se
m-ou-se committed Sep 27, 2022
commit 8d9a5881ea18568f014ea09ec9d2f1d0cdacff1b
33 changes: 14 additions & 19 deletions compiler/rustc_builtin_macros/src/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down