about summary refs log tree commit diff
path: root/src/libunicode
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-12-22 12:56:18 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-12-22 15:17:26 -0800
commit3583d613b9c81855feb067aeeebb525cf8a4184c (patch)
tree931437f34b35af7d9f74b9fa5e335ddcfed35184 /src/libunicode
parent8824c39945cf8cbdd0e1a07824e3d2f4823b8e7b (diff)
downloadrust-3583d613b9c81855feb067aeeebb525cf8a4184c.tar.gz
rust-3583d613b9c81855feb067aeeebb525cf8a4184c.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/libunicode')
-rw-r--r--src/libunicode/u_str.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libunicode/u_str.rs b/src/libunicode/u_str.rs
index 65b8ad997f6..a3d4dd057d0 100644
--- a/src/libunicode/u_str.rs
+++ b/src/libunicode/u_str.rs
@@ -404,7 +404,7 @@ pub fn is_utf16(v: &[u16]) -> bool {
 /// of `u16`s.
 #[deriving(Clone)]
 pub struct Utf16Items<'a> {
-    iter: slice::Items<'a, u16>
+    iter: slice::Iter<'a, u16>
 }
 /// The possibilities for values decoded from a `u16` stream.
 #[deriving(PartialEq, Eq, Clone, Show)]