about summary refs log tree commit diff
path: root/src/libunicode
diff options
context:
space:
mode:
authorAaron Turon <aturon@mozilla.com>2014-08-18 17:52:38 -0700
committerAaron Turon <aturon@mozilla.com>2014-08-28 09:12:54 -0700
commit276b8b125d3f60cebab702542b60207429fbb333 (patch)
tree022549e5a1b801df28b222d3bcd37194b997b849 /src/libunicode
parent3a52ef4613f85fba1ecfd8746388bf34a5499bf9 (diff)
downloadrust-276b8b125d3f60cebab702542b60207429fbb333.tar.gz
rust-276b8b125d3f60cebab702542b60207429fbb333.zip
Fallout from stabilizing core::option
Diffstat (limited to 'src/libunicode')
-rw-r--r--src/libunicode/u_str.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libunicode/u_str.rs b/src/libunicode/u_str.rs
index c71cf5557e3..88f9c2b4ce3 100644
--- a/src/libunicode/u_str.rs
+++ b/src/libunicode/u_str.rs
@@ -245,7 +245,7 @@ impl<'a> Iterator<&'a str> for Graphemes<'a> {
             // looking up each character twice.
             cat = match self.cat {
                 None => gr::grapheme_category(ch),
-                _ => self.cat.take_unwrap()
+                _ => self.cat.take().unwrap()
             };
 
             if match cat {
@@ -345,7 +345,7 @@ impl<'a> DoubleEndedIterator<&'a str> for Graphemes<'a> {
             // cached category, if any
             cat = match self.catb {
                 None => gr::grapheme_category(ch),
-                _ => self.catb.take_unwrap()
+                _ => self.catb.take().unwrap()
             };
 
             // a matching state machine that runs *backwards* across an input string