Skip to content

Commit 60d296a

Browse files
Rollup merge of rust-lang#137772 - thaliaarchi:bstr-display, r=joshtriplett
Fix char count in `Display` for `ByteStr` `ByteStr as Display` performs a byte count when a char count is required. r? ```````````@joshtriplett```````````
2 parents 88a93b3 + 9ddd920 commit 60d296a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

core/src/bstr.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@ impl fmt::Display for ByteStr {
151151
};
152152
let nchars: usize = self
153153
.utf8_chunks()
154-
.map(|chunk| chunk.valid().len() + if chunk.invalid().is_empty() { 0 } else { 1 })
154+
.map(|chunk| {
155+
chunk.valid().chars().count() + if chunk.invalid().is_empty() { 0 } else { 1 }
156+
})
155157
.sum();
156158
let padding = f.width().unwrap_or(0).saturating_sub(nchars);
157159
let fill = f.fill();

0 commit comments

Comments
 (0)