From 3583d613b9c81855feb067aeeebb525cf8a4184c Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 22 Dec 2014 12:56:18 -0800
Subject: Test fixes and rebase conflicts

---
 src/libcore/str.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libcore')

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
-- 
cgit 1.4.1-3-g733a5