Skip to content

Commit 013400c

Browse files
blake2-ppcthestinger
authored andcommitted
---
yaml --- r: 69405 b: refs/heads/auto c: 7ae17e0 h: refs/heads/master i: 69403: 68eb9f1 v: v3
1 parent a0fa8ae commit 013400c

File tree

7 files changed

+52
-63
lines changed

7 files changed

+52
-63
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: d7c9bb4b688ff20a3fd1d4ff1a11bb4dcbdc2c47
17+
refs/heads/auto: 7ae17e0964b9f869881f4122cd0e1ccc19bee0d4
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libextra/dlist.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ impl<T> DList<T> {
356356

357357
/// Provide a reverse iterator
358358
#[inline]
359-
pub fn rev_iter<'a>(&'a self) -> InvertIterator<&'a T, DListIterator<'a, T>> {
359+
pub fn rev_iter<'a>(&'a self) -> InvertIterator<DListIterator<'a, T>> {
360360
self.iter().invert()
361361
}
362362

@@ -376,8 +376,7 @@ impl<T> DList<T> {
376376
}
377377
/// Provide a reverse iterator with mutable references
378378
#[inline]
379-
pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<&'a mut T,
380-
MutDListIterator<'a, T>> {
379+
pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<MutDListIterator<'a, T>> {
381380
self.mut_iter().invert()
382381
}
383382

@@ -390,7 +389,7 @@ impl<T> DList<T> {
390389

391390
/// Consume the list into an iterator yielding elements by value, in reverse
392391
#[inline]
393-
pub fn consume_rev_iter(self) -> InvertIterator<T, ConsumeIterator<T>> {
392+
pub fn consume_rev_iter(self) -> InvertIterator<ConsumeIterator<T>> {
394393
self.consume_iter().invert()
395394
}
396395
}

branches/auto/src/libextra/ringbuf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ impl<T> RingBuf<T> {
184184
}
185185

186186
/// Back-to-front iterator.
187-
pub fn rev_iter<'a>(&'a self) -> InvertIterator<&'a T, RingBufIterator<'a, T>> {
187+
pub fn rev_iter<'a>(&'a self) -> InvertIterator<RingBufIterator<'a, T>> {
188188
self.iter().invert()
189189
}
190190

@@ -195,7 +195,7 @@ impl<T> RingBuf<T> {
195195
}
196196

197197
/// Back-to-front iterator which returns mutable values.
198-
pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<&'a mut T, RingBufMutIterator<'a, T>> {
198+
pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<RingBufMutIterator<'a, T>> {
199199
self.mut_iter().invert()
200200
}
201201
}

branches/auto/src/libextra/smallintmap.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ impl<V> SmallIntMap<V> {
207207
/// Empties the hash map, moving all values into the specified closure
208208
pub fn consume(&mut self)
209209
-> FilterMapIterator<(uint, Option<V>), (uint, V),
210-
EnumerateIterator<Option<V>, VecConsumeIterator<Option<V>>>>
210+
EnumerateIterator<VecConsumeIterator<Option<V>>>>
211211
{
212212
let values = replace(&mut self.v, ~[]);
213213
values.consume_iter().enumerate().filter_map(|(i, v)| {
@@ -293,8 +293,7 @@ pub struct SmallIntMapIterator<'self, T> {
293293

294294
iterator!(impl SmallIntMapIterator -> (uint, &'self T), get_ref)
295295
double_ended_iterator!(impl SmallIntMapIterator -> (uint, &'self T), get_ref)
296-
pub type SmallIntMapRevIterator<'self, T> = InvertIterator<(uint, &'self T),
297-
SmallIntMapIterator<'self, T>>;
296+
pub type SmallIntMapRevIterator<'self, T> = InvertIterator<SmallIntMapIterator<'self, T>>;
298297

299298
pub struct SmallIntMapMutIterator<'self, T> {
300299
priv front: uint,
@@ -304,8 +303,7 @@ pub struct SmallIntMapMutIterator<'self, T> {
304303

305304
iterator!(impl SmallIntMapMutIterator -> (uint, &'self mut T), get_mut_ref)
306305
double_ended_iterator!(impl SmallIntMapMutIterator -> (uint, &'self mut T), get_mut_ref)
307-
pub type SmallIntMapMutRevIterator<'self, T> = InvertIterator<(uint, &'self mut T),
308-
SmallIntMapMutIterator<'self, T>>;
306+
pub type SmallIntMapMutRevIterator<'self, T> = InvertIterator<SmallIntMapMutIterator<'self, T>>;
309307

310308
#[cfg(test)]
311309
mod test_map {

branches/auto/src/libstd/hashmap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ impl<T:Hash + Eq> HashSet<T> {
770770

771771
/// Visit the values representing the symmetric difference
772772
pub fn symmetric_difference_iter<'a>(&'a self, other: &'a HashSet<T>)
773-
-> ChainIterator<&'a T, SetAlgebraIter<'a, T>, SetAlgebraIter<'a, T>> {
773+
-> ChainIterator<SetAlgebraIter<'a, T>, SetAlgebraIter<'a, T>> {
774774
self.difference_iter(other).chain_(other.difference_iter(self))
775775
}
776776

@@ -783,7 +783,7 @@ impl<T:Hash + Eq> HashSet<T> {
783783

784784
/// Visit the values representing the union
785785
pub fn union_iter<'a>(&'a self, other: &'a HashSet<T>)
786-
-> ChainIterator<&'a T, HashSetIterator<'a, T>, SetAlgebraIter<'a, T>> {
786+
-> ChainIterator<HashSetIterator<'a, T>, SetAlgebraIter<'a, T>> {
787787
self.iter().chain_(other.difference_iter(self))
788788
}
789789

0 commit comments

Comments
 (0)