Test fixes and rebase conflicts

This commit is contained in:
Alex Crichton 2014-12-22 12:56:18 -08:00
parent 8824c39945
commit 3583d613b9
8 changed files with 15 additions and 22 deletions

View file

@ -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