about summary refs log tree commit diff
path: root/src/libcore
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/libcore
parent8824c39945cf8cbdd0e1a07824e3d2f4823b8e7b (diff)
downloadrust-3583d613b9c81855feb067aeeebb525cf8a4184c.tar.gz
rust-3583d613b9c81855feb067aeeebb525cf8a4184c.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/str.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index de5b34ff0ca..204ffae6cbd 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -336,7 +336,7 @@ impl<'a> DoubleEndedIterator<(uint, char)> for CharIndices<'a> {
 #[stable]
 #[deriving(Clone)]
 pub struct Bytes<'a> {
-    inner: Map<&'a u8, u8, slice::Items<'a, u8>, BytesFn>,
+    inner: Map<&'a u8, u8, slice::Iter<'a, u8>, BytesFn>,
 }
 
 /// A temporary new type wrapper that ensures that the `Bytes` iterator