Merge pull request #32 from linkmauve/patch-1

Manishearth · web-flow · commit f5a9b4efa514 · 2023-02-17T07:05:32.000-08:00
Use Iterator::sum() instead of fold()
diff --git a/src/lib.rs b/src/lib.rs
@@ -59,8 +59,6 @@ extern crate test;
 use tables::charwidth as cw;
 pub use tables::UNICODE_VERSION;
 
-use core::ops::Add;
-
 mod tables;
 
 #[cfg(test)]
@@ -121,11 +119,11 @@ pub trait UnicodeWidthStr {
 impl UnicodeWidthStr for str {
     #[inline]
     fn width(&self) -> usize {
-        self.chars().map(|c| cw::width(c, false).unwrap_or(0)).fold(0, Add::add)
+        self.chars().map(|c| cw::width(c, false).unwrap_or(0)).sum()
     }
 
     #[inline]
     fn width_cjk(&self) -> usize {
-        self.chars().map(|c| cw::width(c, true).unwrap_or(0)).fold(0, Add::add)
+        self.chars().map(|c| cw::width(c, true).unwrap_or(0)).sum()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,6 @@ extern crate test;`
`59`	`59`	`use tables::charwidth as cw;`
`60`	`60`	`pub use tables::UNICODE_VERSION;`
`61`	`61`
`62`		`-use core::ops::Add;`
`63`		`-`
`64`	`62`	`mod tables;`
`65`	`63`
`66`	`64`	`#[cfg(test)]`
`@@ -121,11 +119,11 @@ pub trait UnicodeWidthStr {`
`121`	`119`	`impl UnicodeWidthStr for str {`
`122`	`120`	`#[inline]`
`123`	`121`	`fn width(&self) -> usize {`
`124`		`- self.chars().map(\|c\| cw::width(c, false).unwrap_or(0)).fold(0, Add::add)`
	`122`	`+ self.chars().map(\|c\| cw::width(c, false).unwrap_or(0)).sum()`
`125`	`123`	`}`
`126`	`124`
`127`	`125`	`#[inline]`
`128`	`126`	`fn width_cjk(&self) -> usize {`
`129`		`- self.chars().map(\|c\| cw::width(c, true).unwrap_or(0)).fold(0, Add::add)`
	`127`	`+ self.chars().map(\|c\| cw::width(c, true).unwrap_or(0)).sum()`
`130`	`128`	`}`
`131`	`129`	`}`