Fixes

generator/src/lib.rs

@@ -39,7 +39,7 @@ fn get_table_data(unicode_data: &'static str) -> TableData {
         Some((c, name))
     }
 
-    let mut iter = unicode_data.split('\n');
+    let mut iter = unicode_data.lines();
 
     let mut codepoint_names = vec![];
     let mut cjk_ideograph_ranges = vec![];
@@ -98,17 +98,14 @@ pub struct Alias {
 
 pub fn get_aliases(name_aliases: &'static str) -> Vec<Alias> {
     let mut aliases = Vec::new();
-    for line in name_aliases.split(['\n', '\r']) {
-        if line.is_empty() {
-            continue;
-        }
-        if line.starts_with('#') {
+    for line in name_aliases.lines() {
+        if line.is_empty() | line.starts_with('#') {
             continue;
         }
         let mut parts = line.splitn(3, ';');
-        let code = parts.next().unwrap();
-        let alias = parts.next().unwrap();
-        let category = parts.next().unwrap();
+        let code = parts.next().expect(line);
+        let alias = parts.next().expect(code);
+        let category = parts.next().expect(alias);
         aliases.push(Alias {
             code,
             alias,

generator/src/util.rs

@@ -30,29 +30,30 @@ pub struct Split<'a, 'b> {
 impl<'a, 'b> Iterator for Split<'a, 'b> {
     type Item = &'a str;
     fn next(&mut self) -> Option<&'a str> {
-        if self.done {
-            return None;
-        } else if self.s.is_empty() {
-            self.done = true;
-            return Some("");
-        } else if !self.pending.is_empty() {
-            return Some(std::mem::take(&mut self.pending));
-        }
-
-        for (i, b) in self.s.bytes().enumerate() {
-            if b == b' ' || self.splitters.contains(&b) {
-                let ret = &self.s[..i];
-                // dont include the space, but include everything else on the next step
-                if b != b' ' {
-                    self.pending = &self.s[i..i + 1]
+        match (self.done, self.s.is_empty(), self.pending.is_empty()) {
+            (true, _, _) => None,
+            (_, true, _) => {
+                self.done = true;
+                Some("")
+            }
+            (_, _, false) => Some(std::mem::take(&mut self.pending)),
+            _ => {
+                for (i, b) in self.s.bytes().enumerate() {
+                    if b == b' ' || self.splitters.contains(&b) {
+                        let ret = &self.s[..i];
+                        // dont include the space, but include everything else on the next step
+                        if b != b' ' {
+                            self.pending = &self.s[i..i + 1]
+                        }
+                        self.s = &self.s[i + 1..];
+                        return Some(ret);
+                    }
                 }
-                self.s = &self.s[i + 1..];
-                return Some(ret);
+                // trailing data
+                self.done = true;
+                Some(self.s)
             }
         }
-        // trailing data
-        self.done = true;
-        Some(self.s)
     }
 }
 

src/jamo.rs

@@ -19,24 +19,24 @@ pub fn is_hangul_syllable(c: char) -> bool {
 }
 
 pub fn syllable_decomposition(c: char) -> Option<(u8, u8, u8)> {
-    if !is_hangul_syllable(c) {
+    if is_hangul_syllable(c) {
+        let n = c as u32 - 0xAC00;
+        // break this into the various parts.
+        let jongseong = n % 28;
+        let jungseong = (n / 28) % 21;
+        let choseong = n / (28 * 21);
+        Some((choseong as u8, jungseong as u8, jongseong as u8))
+    } else {
         // outside the range
-        return None;
+        None
     }
-    let n = c as u32 - 0xAC00;
-    // break this into the various parts.
-    let jongseong = n % 28;
-    let jungseong = (n / 28) % 21;
-    let choseong = n / (28 * 21);
-
-    Some((choseong as u8, jungseong as u8, jongseong as u8))
 }
 
 fn slice_shift_byte(a: &[u8]) -> (Option<u8>, &[u8]) {
-    if !a.is_empty() {
-        (Some(a[0]), &a[1..])
-    } else {
+    if a.is_empty() {
         (None, a)
+    } else {
+        (Some(a[0]), &a[1..])
     }
 }
 

src/lib.rs

@@ -371,10 +371,10 @@ pub fn character(search_name: &str) -> Option<char> {
         } // avoid overflow
 
         let mut v = 0u32;
-        for &c in remaining.iter() {
-            match c {
-                b'0'..=b'9' => v = (v << 4) | (c - b'0') as u32,
-                b'A'..=b'F' => v = (v << 4) | (c - b'A' + 10) as u32,
+        for &c in remaining {
+            v = match c {
+                b'0'..=b'9' => (v << 4) | (c - b'0') as u32,
+                b'A'..=b'F' => (v << 4) | (c - b'A' + 10) as u32,
                 _ => return None,
             }
         }