mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use fmt::Alignment instead of fmt::rt::v1::Alignment.

Browse Source
This commit is contained in:
Mara Bos 2023-04-20 18:03:47 +02:00
parent debf305d9e
commit a77159341e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/core/src/fmt/mod.rs
View File

@ -1451,7 +1451,7 @@ fn write_prefix(f: &mut Formatter<'_>, sign: Option<char>, prefix: Option<&str>)
let old_fill = crate::mem::replace(&mut self.fill, '0'); let old_fill = crate::mem::replace(&mut self.fill, '0');
let old_align = crate::mem::replace(&mut self.align, rt::v1::Alignment::Right); let old_align = crate::mem::replace(&mut self.align, rt::v1::Alignment::Right);
write_prefix(self, sign, prefix)?; write_prefix(self, sign, prefix)?;
let post_padding = self.padding(min - width, rt::v1::Alignment::Right)?; let post_padding = self.padding(min - width, Alignment::Right)?;
self.buf.write_str(buf)?; self.buf.write_str(buf)?;
post_padding.write(self)?; post_padding.write(self)?;
self.fill = old_fill; self.fill = old_fill;
@ -1460,7 +1460,7 @@ fn write_prefix(f: &mut Formatter<'_>, sign: Option<char>, prefix: Option<&str>)
} }
// Otherwise, the sign and prefix goes after the padding // Otherwise, the sign and prefix goes after the padding
Some(min) => { Some(min) => {
let post_padding = self.padding(min - width, rt::v1::Alignment::Right)?; let post_padding = self.padding(min - width, Alignment::Right)?;
write_prefix(self, sign, prefix)?; write_prefix(self, sign, prefix)?;
self.buf.write_str(buf)?; self.buf.write_str(buf)?;
post_padding.write(self) post_padding.write(self)
@ -1535,7 +1535,7 @@ pub fn pad(&mut self, s: &str) -> Result {
// If we're under both the maximum and the minimum width, then fill // If we're under both the maximum and the minimum width, then fill
// up the minimum width with the specified string + some alignment. // up the minimum width with the specified string + some alignment.
else { else {
let align = rt::v1::Alignment::Left; let align = Alignment::Left;
let post_padding = self.padding(width - chars_count, align)?; let post_padding = self.padding(width - chars_count, align)?;
self.buf.write_str(s)?; self.buf.write_str(s)?;
post_padding.write(self) post_padding.write(self)
@ -1550,17 +1550,19 @@ pub fn pad(&mut self, s: &str) -> Result {
pub(crate) fn padding( pub(crate) fn padding(
&mut self, &mut self,
padding: usize, padding: usize,
default: rt::v1::Alignment, default: Alignment,
) -> result::Result<PostPadding, Error> { ) -> result::Result<PostPadding, Error> {
let align = match self.align { let align = match self.align {
rt::v1::Alignment::Unknown => default, rt::v1::Alignment::Unknown => default,
_ => self.align, rt::v1::Alignment::Left => Alignment::Left,
rt::v1::Alignment::Right => Alignment::Right,
rt::v1::Alignment::Center => Alignment::Center,
}; };
let (pre_pad, post_pad) = match align { let (pre_pad, post_pad) = match align {
rt::v1::Alignment::Left => (0, padding), Alignment::Left => (0, padding),
rt::v1::Alignment::Right | rt::v1::Alignment::Unknown => (padding, 0), Alignment::Right => (padding, 0),
rt::v1::Alignment::Center => (padding / 2, (padding + 1) / 2), Alignment::Center => (padding / 2, (padding + 1) / 2),
}; };
for _ in 0..pre_pad { for _ in 0..pre_pad {
@ -1580,7 +1582,6 @@ fn pad_formatted_parts(&mut self, formatted: &numfmt::Formatted<'_>) -> Result {
let mut formatted = formatted.clone(); let mut formatted = formatted.clone();
let old_fill = self.fill; let old_fill = self.fill;
let old_align = self.align; let old_align = self.align;
let mut align = old_align;
if self.sign_aware_zero_pad() { if self.sign_aware_zero_pad() {
// a sign always goes first // a sign always goes first
let sign = formatted.sign; let sign = formatted.sign;
@ -1589,9 +1590,8 @@ fn pad_formatted_parts(&mut self, formatted: &numfmt::Formatted<'_>) -> Result {
// remove the sign from the formatted parts // remove the sign from the formatted parts
formatted.sign = ""; formatted.sign = "";
width = width.saturating_sub(sign.len()); width = width.saturating_sub(sign.len());
align = rt::v1::Alignment::Right;
self.fill = '0'; self.fill = '0';
self.align = rt::v1::Alignment::Right; self.align = rt::Alignment::Right;
} }
// remaining parts go through the ordinary padding process. // remaining parts go through the ordinary padding process.
@ -1600,7 +1600,7 @@ fn pad_formatted_parts(&mut self, formatted: &numfmt::Formatted<'_>) -> Result {
// no padding // no padding
self.write_formatted_parts(&formatted) self.write_formatted_parts(&formatted)
} else { } else {
let post_padding = self.padding(width - len, align)?; let post_padding = self.padding(width - len, Alignment::Right)?;
self.write_formatted_parts(&formatted)?; self.write_formatted_parts(&formatted)?;
post_padding.write(self) post_padding.write(self)
}; };

2
library/core/src/time.rs
View File

@ -1172,7 +1172,7 @@ fn fmt_decimal(
emit_without_padding(f) emit_without_padding(f)
} else { } else {
// We need to add padding. Use the `Formatter::padding` helper function. // We need to add padding. Use the `Formatter::padding` helper function.
let default_align = crate::fmt::rt::v1::Alignment::Left; let default_align = fmt::Alignment::Left;
let post_padding = f.padding(requested_w - actual_w, default_align)?; let post_padding = f.padding(requested_w - actual_w, default_align)?;
emit_without_padding(f)?; emit_without_padding(f)?;
post_padding.write(f) post_padding.write(f)