nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 11:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #137772 - thaliaarchi:bstr-display, r=joshtriplett

Browse Source 
Fix char count in `Display` for `ByteStr`

`ByteStr as Display` performs a byte count when a char count is required.

r? ```````````@joshtriplett```````````
This commit is contained in:
Michael Goulet 2025-03-06 12:22:16 -05:00 committed by GitHub
commit fe926384c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/bstr.rs
View File

@ -151,7 +151,9 @@ impl fmt::Display for ByteStr {
}; };
let nchars: usize = self let nchars: usize = self
.utf8_chunks() .utf8_chunks()
.map(|chunk| chunk.valid().len() + if chunk.invalid().is_empty() { 0 } else { 1 }) .map(|chunk| {
chunk.valid().chars().count() + if chunk.invalid().is_empty() { 0 } else { 1 }
})
.sum(); .sum();
let padding = f.width().unwrap_or(0).saturating_sub(nchars); let padding = f.width().unwrap_or(0).saturating_sub(nchars);
let fill = f.fill(); let fill = f.fill();