Skip to content

Commit 01cc9c0

Browse files
committed
---
yaml --- r: 63625 b: refs/heads/snap-stage3 c: da1a9a3 h: refs/heads/master i: 63623: d8f247f v: v3
1 parent 143accb commit 01cc9c0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 1e7ca8dd24f4ea7e2aefa46dbf75f8695d139375
4+
refs/heads/snap-stage3: da1a9a30fd647dee99713b3ae3b65f006641c14e
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2500,7 +2500,6 @@ impl<T> FromIter<T> for ~[T]{
25002500
}
25012501
}
25022502

2503-
#[cfg(stage0)]
25042503
impl<A, T: Iterator<A>> FromIterator<A, T> for ~[A] {
25052504
pub fn from_iterator(iterator: &mut T) -> ~[A] {
25062505
let mut xs = ~[];
@@ -2511,7 +2510,7 @@ impl<A, T: Iterator<A>> FromIterator<A, T> for ~[A] {
25112510
}
25122511
}
25132512

2514-
#[cfg(not(stage0))]
2513+
/* FIXME: #7341 - ICE
25152514
impl<A, T: Iterator<A>> FromIterator<A, T> for ~[A] {
25162515
pub fn from_iterator(iterator: &mut T) -> ~[A] {
25172516
let (lower, _) = iterator.size_hint();
@@ -2522,6 +2521,7 @@ impl<A, T: Iterator<A>> FromIterator<A, T> for ~[A] {
25222521
xs
25232522
}
25242523
}
2524+
*/
25252525

25262526
#[cfg(test)]
25272527
mod tests {

0 commit comments

Comments
 (0)