Skip to content

Commit 99490ad

Browse files
author
blake2-ppc
committed
std: Remove macro in vec that's only used once
1 parent ae09d95 commit 99490ad

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

src/libstd/vec.rs

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,23 +2135,19 @@ macro_rules! double_ended_iterator {
21352135
}
21362136
}
21372137

2138-
macro_rules! random_access_iterator {
2139-
(impl $name:ident -> $elem:ty) => {
2140-
impl<'self, T> RandomAccessIterator<$elem> for $name<'self, T> {
2141-
#[inline]
2142-
fn indexable(&self) -> uint {
2143-
let (exact, _) = self.size_hint();
2144-
exact
2145-
}
2138+
impl<'self, T> RandomAccessIterator<&'self T> for VecIterator<'self, T> {
2139+
#[inline]
2140+
fn indexable(&self) -> uint {
2141+
let (exact, _) = self.size_hint();
2142+
exact
2143+
}
21462144

2147-
fn idx(&self, index: uint) -> Option<$elem> {
2148-
unsafe {
2149-
if index < self.indexable() {
2150-
cast::transmute(self.ptr.offset(index))
2151-
} else {
2152-
None
2153-
}
2154-
}
2145+
fn idx(&self, index: uint) -> Option<&'self T> {
2146+
unsafe {
2147+
if index < self.indexable() {
2148+
cast::transmute(self.ptr.offset(index))
2149+
} else {
2150+
None
21552151
}
21562152
}
21572153
}
@@ -2166,7 +2162,6 @@ pub struct VecIterator<'self, T> {
21662162
}
21672163
iterator!{impl VecIterator -> &'self T}
21682164
double_ended_iterator!{impl VecIterator -> &'self T}
2169-
random_access_iterator!{impl VecIterator -> &'self T}
21702165
pub type RevIterator<'self, T> = Invert<VecIterator<'self, T>>;
21712166

21722167
impl<'self, T> Clone for VecIterator<'self, T> {

0 commit comments

Comments
 (0)