Remove map_err

yt2b · yt2b · commit e60a264dc82b · 2023-01-06T00:02:39.000+09:00
diff --git a/common/src/format.rs b/common/src/format.rs
@@ -522,7 +522,6 @@ impl FormatSpec {
             sign_str,
             FormatAlign::Right,
         )
-        .map_err(|msg| msg.to_owned())
     }
 
     #[inline]
@@ -605,7 +604,6 @@ impl FormatSpec {
             &sign_prefix,
             FormatAlign::Right,
         )
-        .map_err(|msg| msg.to_owned())
     }
 
     pub fn format_string(&self, s: &BorrowedStr) -> Result<String, String> {
@@ -618,8 +616,7 @@ impl FormatSpec {
                         value.truncate(precision);
                     }
                     value
-                })
-                .map_err(|msg| msg.to_owned()),
+                }),
             _ => {
                 let ch = char::from(self.format_type.as_ref().unwrap());
                 Err(format!(
@@ -635,7 +632,7 @@ impl FormatSpec {
         magnitude_str: &BorrowedStr,
         sign_str: &str,
         default_align: FormatAlign,
-    ) -> Result<String, &'static str> {
+    ) -> Result<String, String> {
         let align = self.align.unwrap_or(default_align);
 
         let num_chars = magnitude_str.char_len();

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,6 @@ impl FormatSpec {`
`522`	`522`	`sign_str,`
`523`	`523`	`FormatAlign::Right,`
`524`	`524`	`)`
`525`		`- .map_err(\|msg\| msg.to_owned())`
`526`	`525`	`}`
`527`	`526`
`528`	`527`	`#[inline]`
`@@ -605,7 +604,6 @@ impl FormatSpec {`
`605`	`604`	`&sign_prefix,`
`606`	`605`	`FormatAlign::Right,`
`607`	`606`	`)`
`608`		`- .map_err(\|msg\| msg.to_owned())`
`609`	`607`	`}`
`610`	`608`
`611`	`609`	`pub fn format_string(&self, s: &BorrowedStr) -> Result<String, String> {`
`@@ -618,8 +616,7 @@ impl FormatSpec {`
`618`	`616`	`value.truncate(precision);`
`619`	`617`	`}`
`620`	`618`	`value`
`621`		`- })`
`622`		`- .map_err(\|msg\| msg.to_owned()),`
	`619`	`+ }),`
`623`	`620`	`_ => {`
`624`	`621`	`let ch = char::from(self.format_type.as_ref().unwrap());`
`625`	`622`	`Err(format!(`
`@@ -635,7 +632,7 @@ impl FormatSpec {`
`635`	`632`	`magnitude_str: &BorrowedStr,`
`636`	`633`	`sign_str: &str,`
`637`	`634`	`default_align: FormatAlign,`
`638`		`- ) -> Result<String, &'static str> {`
	`635`	`+ ) -> Result<String, String> {`
`639`	`636`	`let align = self.align.unwrap_or(default_align);`
`640`	`637`
`641`	`638`	`let num_chars = magnitude_str.char_len();`