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

Simplify loop in format_args lowering.

Browse source
This commit is contained in:
Mara Bos 2025-11-12 14:56:58 +01:00
parent e9d212ddce
commit cfbdc2c36d
1 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_ast_lowering/src/format.rs
View file

@ -89,9 +89,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
let mut was_inlined = vec![false; fmt.arguments.all_args().len()];
let mut inlined_anything = false;
let mut i = 0;
while i < fmt.template.len() {
for i in 0..fmt.template.len() {
if let FormatArgsPiece::Placeholder(placeholder) = &fmt.template[i]
&& let Ok(arg_index) = placeholder.argument.index
&& let FormatTrait::Display = placeholder.format_trait
@ -104,16 +102,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
// If this is the first time, this clones the outer FormatArgs.
let fmt = fmt.to_mut();
// Replace the placeholder with the literal.
if literal.is_empty() {
fmt.template.remove(i);
} else {
fmt.template[i] = FormatArgsPiece::Literal(literal);
i += 1;
}
fmt.template[i] = FormatArgsPiece::Literal(literal);
was_inlined[arg_index] = true;
inlined_anything = true;
} else {
i += 1;
}
}
@ -349,10 +340,6 @@ fn expand_format_args<'hir>(
return hir::ExprKind::Call(from_str, args);
}
// It shouldn't be possible to have an empty literal here. Encoding an empty literal
// would result in a single 0 byte, which marks the end of the template byte sequence.
debug_assert!(!s.is_empty());
// Encode the literal in chunks of up to u16::MAX bytes, split at utf-8 boundaries.
while !s.is_empty() {
let len = s.floor_char_boundary(usize::from(u16::MAX));