Merge pull request uutils#356 from kwantam/master

fmt: switch to char.width() method
jbcrail · Jul 14, 2014 · babd511 · babd511
2 parents 0259777 + 5d94f2a
commit babd511
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 197 deletions.
diff --git a/fmt/charwidth.rs b/fmt/charwidth.rs
diff --git a/fmt/fmt.rs b/fmt/fmt.rs
@@ -32,7 +32,6 @@ macro_rules! silent_unwrap(
 mod util;
 mod linebreak;
 mod parasplit;
-mod charwidth;
 
 // program's NAME and VERSION are used for -V and -h
 static NAME: &'static str = "fmt";

diff --git a/fmt/parasplit.rs b/fmt/parasplit.rs
@@ -13,7 +13,6 @@ use std::slice::Items;
 use std::str::CharRange;
 use FileOrStdReader;
 use FmtOptions;
-use charwidth;
 
 #[inline(always)]
 fn char_width(c: char) -> uint {
@@ -25,7 +24,7 @@ fn char_width(c: char) -> uint {
         // otherwise, get the unicode width
         // note that we shouldn't actually get None here because only c < 0xA0
         // can return None, but for safety and future-proofing we do it this way
-        charwidth::width(c, false).unwrap_or(1)
+        c.width(false).unwrap_or(1)
     }
 }
 
@@ -39,7 +38,7 @@ enum Line {
 
 impl Line {
     // when we know that it's a FormatLine, as in the ParagraphStream iterator
-    fn get_fileline(self) -> FileLine {
+    fn get_formatline(self) -> FileLine {
         match self {
             FormatLine(fl) => fl,
             NoFormatLine(..) => fail!("Found NoFormatLine when expecting FormatLine")
@@ -367,7 +366,7 @@ impl<'a> Iterator<Result<Paragraph, String>> for ParagraphStream<'a> {
                 }
             }
 
-            pLines.push(self.lines.next().unwrap().get_fileline().line);
+            pLines.push(self.lines.next().unwrap().get_formatline().line);
 
             // when we're in split-only mode, we never join lines, so stop here
             if self.opts.split_only {