diff options
| author | Michael Sullivan <sully@msully.net> | 2013-06-25 14:07:44 -0700 |
|---|---|---|
| committer | Michael Sullivan <sully@msully.net> | 2013-06-28 16:12:08 -0700 |
| commit | a9e51f5f701d8104be0adfb50f5d409f8bf233ff (patch) | |
| tree | 4bb62509e2d462d2cec71891645d102713c70bd0 /src/libstd | |
| parent | 050d0e6b29d19978584f6e389f53612497b7e41e (diff) | |
| download | rust-a9e51f5f701d8104be0adfb50f5d409f8bf233ff.tar.gz rust-a9e51f5f701d8104be0adfb50f5d409f8bf233ff.zip | |
Make default method handling not choke on self region params. Closes #7341.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/vec.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index aa4d632a482..8555d99255d 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -2346,6 +2346,7 @@ impl<T> FromIter<T> for ~[T]{ } } +#[cfg(stage0)] impl<A, T: Iterator<A>> FromIterator<A, T> for ~[A] { pub fn from_iterator(iterator: &mut T) -> ~[A] { let mut xs = ~[]; @@ -2356,7 +2357,8 @@ impl<A, T: Iterator<A>> FromIterator<A, T> for ~[A] { } } -/* FIXME: #7341 - ICE + +#[cfg(not(stage0))] impl<A, T: Iterator<A>> FromIterator<A, T> for ~[A] { pub fn from_iterator(iterator: &mut T) -> ~[A] { let (lower, _) = iterator.size_hint(); @@ -2367,7 +2369,7 @@ impl<A, T: Iterator<A>> FromIterator<A, T> for ~[A] { xs } } -*/ + #[cfg(test)] mod tests { |