Rename to ZeroPadding and AlignmentFlag

yt2b · yt2b · commit 010797e00973 · 2025-07-04T17:12:29.000+09:00
diff --git a/common/src/format.rs b/common/src/format.rs
@@ -623,10 +623,10 @@ impl FormatSpec {
             format!("{formatted_re}{formatted_im}")
         };
         if let Some(FormatAlign::AfterSign) = &self.align {
-            return Err(FormatSpecError::AlignmentFlagNotAllowed);
+            return Err(FormatSpecError::AlignmentFlag);
         }
         match &self.fill.unwrap_or(' '.into()).to_char() {
-            Some('0') => Err(FormatSpecError::ZeroPaddingNotAllowed),
+            Some('0') => Err(FormatSpecError::ZeroPadding),
             _ => self.format_sign_and_align(&AsciiStr::new(&magnitude_str), "", FormatAlign::Right),
         }
     }
@@ -823,8 +823,8 @@ pub enum FormatSpecError {
     NotAllowed(&'static str),
     UnableToConvert,
     CodeNotInRange,
-    ZeroPaddingNotAllowed,
-    AlignmentFlagNotAllowed,
+    ZeroPadding,
+    AlignmentFlag,
     NotImplemented(char, &'static str),
 }
 
diff --git a/vm/src/format.rs b/vm/src/format.rs
@@ -34,10 +34,10 @@ impl IntoPyException for FormatSpecError {
             }
             Self::UnableToConvert => vm.new_value_error("Unable to convert int to float"),
             Self::CodeNotInRange => vm.new_overflow_error("%c arg not in range(0x110000)"),
-            Self::ZeroPaddingNotAllowed => {
+            Self::ZeroPadding => {
                 vm.new_value_error("Zero padding is not allowed in complex format specifier")
             }
-            Self::AlignmentFlagNotAllowed => {
+            Self::AlignmentFlag => {
                 vm.new_value_error("'=' alignment flag is not allowed in complex format specifier")
             }
             Self::NotImplemented(c, s) => {

Original file line number	Diff line number	Diff line change
`@@ -623,10 +623,10 @@ impl FormatSpec {`
`623`	`623`	`format!("{formatted_re}{formatted_im}")`
`624`	`624`	`};`
`625`	`625`	`if let Some(FormatAlign::AfterSign) = &self.align {`
`626`		`- return Err(FormatSpecError::AlignmentFlagNotAllowed);`
	`626`	`+ return Err(FormatSpecError::AlignmentFlag);`
`627`	`627`	`}`
`628`	`628`	`match &self.fill.unwrap_or(' '.into()).to_char() {`
`629`		`- Some('0') => Err(FormatSpecError::ZeroPaddingNotAllowed),`
	`629`	`+ Some('0') => Err(FormatSpecError::ZeroPadding),`
`630`	`630`	`_ => self.format_sign_and_align(&AsciiStr::new(&magnitude_str), "", FormatAlign::Right),`
`631`	`631`	`}`
`632`	`632`	`}`
`@@ -823,8 +823,8 @@ pub enum FormatSpecError {`
`823`	`823`	`NotAllowed(&'static str),`
`824`	`824`	`UnableToConvert,`
`825`	`825`	`CodeNotInRange,`
`826`		`- ZeroPaddingNotAllowed,`
`827`		`- AlignmentFlagNotAllowed,`
	`826`	`+ ZeroPadding,`
	`827`	`+ AlignmentFlag,`
`828`	`828`	`NotImplemented(char, &'static str),`
`829`	`829`	`}`
`830`	`830`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ impl IntoPyException for FormatSpecError {`
`34`	`34`	`}`
`35`	`35`	`Self::UnableToConvert => vm.new_value_error("Unable to convert int to float"),`
`36`	`36`	`Self::CodeNotInRange => vm.new_overflow_error("%c arg not in range(0x110000)"),`
`37`		`- Self::ZeroPaddingNotAllowed => {`
	`37`	`+ Self::ZeroPadding => {`
`38`	`38`	`vm.new_value_error("Zero padding is not allowed in complex format specifier")`
`39`	`39`	`}`
`40`		`- Self::AlignmentFlagNotAllowed => {`
	`40`	`+ Self::AlignmentFlag => {`
`41`	`41`	`vm.new_value_error("'=' alignment flag is not allowed in complex format specifier")`
`42`	`42`	`}`
`43`	`43`	`Self::NotImplemented(c, s) => {`