openharmony/third_party_rust_unicode-normalization
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_rust_unicode-normalization.git synced 2026-07-19 23:13:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary unwrap in recompose

Browse Source
This commit is contained in:
Sujay Jayakar
2018-04-27 13:37:29 +05:30
parent 74dddd6f8d
commit 4d76b961b8
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/recompose.rs
+10 -9
View File
@@ -63,15 +63,16 @@ impl<I: Iterator<Item=char>> Iterator for Recompositions<I> {
Composing => {
for ch in self.iter.by_ref() {
let ch_class = super::char::canonical_combining_class(ch);
if self.composee.is_none() {
if ch_class != 0 {
return Some(ch);
}
self.composee = Some(ch);
continue;
}
let k = self.composee.clone().unwrap();
let k = match self.composee {
None => {
if ch_class != 0 {
return Some(ch);
}
self.composee = Some(ch);
continue;
},
Some(k) => k,
};
match self.last_ccc {
None => {
match super::char::compose(k, ch) {