---

yaml
---
r: 143075
b: refs/heads/try2
c: 06594ed
h: refs/heads/master
i:
  143073: 29d9c62
  143071: 13e20d3
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 75b4b1b027ec5c5b72d496b7a10da418d5308c01
+refs/heads/try2: 06594ed96bae46cca494dc456ddffcd403efbd8e
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/dbg.rs

@@ -25,7 +25,7 @@ pub mod rustrt {
     use std::unstable::intrinsics::{TyDesc};
 
     #[abi = "cdecl"]
-    pub extern {
+    extern {
         pub unsafe fn debug_tydesc(td: *TyDesc);
         pub unsafe fn debug_opaque(td: *TyDesc, x: *());
         pub unsafe fn debug_box(td: *TyDesc, x: *());

branches/try2/src/libextra/dlist.rs

@@ -47,7 +47,6 @@ struct Node<T> {
 }
 
 /// Double-ended DList iterator
-#[deriving(Clone)]
 pub struct DListIterator<'self, T> {
     priv head: &'self Link<T>,
     priv tail: Rawlink<Node<T>>,
@@ -63,7 +62,6 @@ pub struct MutDListIterator<'self, T> {
 }
 
 /// DList consuming iterator
-#[deriving(Clone)]
 pub struct ConsumeIterator<T> {
     priv list: DList<T>
 }
@@ -95,13 +93,6 @@ impl<T> Rawlink<T> {
     }
 }
 
-impl<T> Clone for Rawlink<T> {
-    #[inline]
-    fn clone(&self) -> Rawlink<T> {
-        Rawlink{p: self.p}
-    }
-}
-
 /// Set the .prev field on `next`, then return `Some(next)`
 fn link_with_prev<T>(mut next: ~Node<T>, prev: Rawlink<Node<T>>) -> Link<T> {
     next.prev = prev;
@@ -695,20 +686,6 @@ mod tests {
         assert_eq!(it.next(), None);
     }
 
-    #[test]
-    fn test_iterator_clone() {
-        let mut n = DList::new();
-        n.push_back(2);
-        n.push_back(3);
-        n.push_back(4);
-        let mut it = n.iter();
-        it.next();
-        let mut jt = it.clone();
-        assert_eq!(it.next(), jt.next());
-        assert_eq!(it.next_back(), jt.next_back());
-        assert_eq!(it.next(), jt.next());
-    }
-
     #[test]
     fn test_iterator_double_end() {
         let mut n = DList::new();

branches/try2/src/libextra/flate.rs

@@ -24,18 +24,18 @@ pub mod rustrt {
     use std::libc::{c_int, c_void, size_t};
 
     #[link_name = "rustrt"]
-    pub extern {
-        unsafe fn tdefl_compress_mem_to_heap(psrc_buf: *const c_void,
-                                             src_buf_len: size_t,
-                                             pout_len: *mut size_t,
-                                             flags: c_int)
-                                          -> *c_void;
+    extern {
+        pub unsafe fn tdefl_compress_mem_to_heap(psrc_buf: *const c_void,
+                                                 src_buf_len: size_t,
+                                                 pout_len: *mut size_t,
+                                                 flags: c_int)
+                                                 -> *c_void;
 
-        unsafe fn tinfl_decompress_mem_to_heap(psrc_buf: *const c_void,
-                                               src_buf_len: size_t,
-                                               pout_len: *mut size_t,
-                                               flags: c_int)
-                                            -> *c_void;
+        pub unsafe fn tinfl_decompress_mem_to_heap(psrc_buf: *const c_void,
+                                                   src_buf_len: size_t,
+                                                   pout_len: *mut size_t,
+                                                   flags: c_int)
+                                                   -> *c_void;
     }
 }
 

branches/try2/src/libextra/net/tcp.rs

@@ -35,11 +35,11 @@ pub mod rustrt {
     use std::libc;
 
     #[nolink]
-    pub extern {
-        unsafe fn rust_uv_current_kernel_malloc(size: libc::c_uint)
-                                             -> *libc::c_void;
-        unsafe fn rust_uv_current_kernel_free(mem: *libc::c_void);
-        unsafe fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint;
+    extern {
+        pub unsafe fn rust_uv_current_kernel_malloc(size: libc::c_uint)
+                                                    -> *libc::c_void;
+        pub unsafe fn rust_uv_current_kernel_free(mem: *libc::c_void);
+        pub unsafe fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint;
     }
 }
 

branches/try2/src/libextra/rl.rs

@@ -19,7 +19,7 @@ use std::str;
 pub mod rustrt {
     use std::libc::{c_char, c_int};
 
-    pub extern {
+    extern {
         pub unsafe fn linenoise(prompt: *c_char) -> *c_char;
         pub unsafe fn linenoiseHistoryAdd(line: *c_char) -> c_int;
         pub unsafe fn linenoiseHistorySetMaxLen(len: c_int) -> c_int;

branches/try2/src/libextra/time.rs

@@ -22,7 +22,7 @@ pub mod rustrt {
     use super::Tm;
 
     #[abi = "cdecl"]
-    pub extern {
+    extern {
         pub unsafe fn get_time(sec: &mut i64, nsec: &mut i32);
 
         pub unsafe fn precise_time_ns(ns: &mut u64);

branches/try2/src/libextra/unicode.rs

@@ -161,15 +161,15 @@ pub mod icu {
     pub mod libicu {
         #[link_name = "icuuc"]
         #[abi = "cdecl"]
-        pub extern {
-            unsafe fn u_hasBinaryProperty(c: UChar32, which: UProperty)
-                                       -> UBool;
-            unsafe fn u_isdigit(c: UChar32) -> UBool;
-            unsafe fn u_islower(c: UChar32) -> UBool;
-            unsafe fn u_isspace(c: UChar32) -> UBool;
-            unsafe fn u_isupper(c: UChar32) -> UBool;
-            unsafe fn u_tolower(c: UChar32) -> UChar32;
-            unsafe fn u_toupper(c: UChar32) -> UChar32;
+        extern {
+            pub unsafe fn u_hasBinaryProperty(c: UChar32, which: UProperty)
+                                              -> UBool;
+            pub unsafe fn u_isdigit(c: UChar32) -> UBool;
+            pub unsafe fn u_islower(c: UChar32) -> UBool;
+            pub unsafe fn u_isspace(c: UChar32) -> UBool;
+            pub unsafe fn u_isupper(c: UChar32) -> UBool;
+            pub unsafe fn u_tolower(c: UChar32) -> UChar32;
+            pub unsafe fn u_toupper(c: UChar32) -> UChar32;
         }
     }
 }

branches/try2/src/librustc/lib/llvm.rs

@@ -273,7 +273,7 @@ pub mod llvm {
     #[link_args = "-Lrustllvm -lrustllvm"]
     #[link_name = "rustllvm"]
     #[abi = "cdecl"]
-    pub extern {
+    extern {
         /* Create and destroy contexts. */
         #[fast_ffi]
         pub unsafe fn LLVMContextCreate() -> ContextRef;

branches/try2/src/libstd/cleanup.rs

@@ -166,7 +166,7 @@ pub mod rustrt {
     use libc::c_void;
 
     #[link_name = "rustrt"]
-    pub extern {
+    extern {
         #[rust_stack]
         // FIXME (#4386): Unable to make following method private.
         pub unsafe fn rust_get_task() -> *c_void;

branches/try2/src/libstd/gc.rs

@@ -64,7 +64,7 @@ pub mod rustrt {
     use super::StackSegment;
 
     #[link_name = "rustrt"]
-    pub extern {
+    extern {
         #[rust_stack]
         pub unsafe fn rust_gc_metadata() -> *Word;
 

branches/try2/src/libstd/hashmap.rs

@@ -548,7 +548,6 @@ impl<K:Hash + Eq + Clone,V:Clone> Clone for HashMap<K,V> {
 }
 
 /// HashMap iterator
-#[deriving(Clone)]
 pub struct HashMapIterator<'self, K, V> {
     priv iter: vec::VecIterator<'self, Option<Bucket<K, V>>>,
 }
@@ -564,7 +563,6 @@ pub struct HashMapConsumeIterator<K, V> {
 }
 
 /// HashSet iterator
-#[deriving(Clone)]
 pub struct HashSetIterator<'self, K> {
     priv iter: vec::VecIterator<'self, Option<Bucket<K, ()>>>,
 }

branches/try2/src/libstd/io.rs

@@ -77,10 +77,10 @@ pub mod rustrt {
 
     #[abi = "cdecl"]
     #[link_name = "rustrt"]
-    pub extern {
-        unsafe fn rust_get_stdin() -> *libc::FILE;
-        unsafe fn rust_get_stdout() -> *libc::FILE;
-        unsafe fn rust_get_stderr() -> *libc::FILE;
+    extern {
+        pub unsafe fn rust_get_stdin() -> *libc::FILE;
+        pub unsafe fn rust_get_stdout() -> *libc::FILE;
+        pub unsafe fn rust_get_stderr() -> *libc::FILE;
     }
 }
 

branches/try2/src/libstd/iterator.rs

@@ -74,7 +74,6 @@ impl<A, T: DoubleEndedIterator<A>> DoubleEndedIteratorUtil<A> for T {
 
 /// An double-ended iterator with the direction inverted
 // FIXME #6967: Dummy A parameter to get around type inference bug
-#[deriving(Clone)]
 pub struct InvertIterator<A, T> {
     priv iter: T
 }
@@ -730,59 +729,8 @@ impl<A: Ord, T: Iterator<A>> OrdIterator<A> for T {
     }
 }
 
-/// A trait for iterators that are clonable.
-// FIXME #6967: Dummy A parameter to get around type inference bug
-pub trait ClonableIterator<A> {
-    /// Repeats an iterator endlessly
-    ///
-    /// # Example
-    ///
-    /// ~~~ {.rust}
-    /// let a = Counter::new(1,1).take_(1);
-    /// let mut cy = a.cycle();
-    /// assert_eq!(cy.next(), Some(1));
-    /// assert_eq!(cy.next(), Some(1));
-    /// ~~~
-    fn cycle(self) -> CycleIterator<A, Self>;
-}
-
-impl<A, T: Clone + Iterator<A>> ClonableIterator<A> for T {
-    #[inline]
-    fn cycle(self) -> CycleIterator<A, T> {
-        CycleIterator{orig: self.clone(), iter: self}
-    }
-}
-
-/// An iterator that repeats endlessly
-#[deriving(Clone)]
-pub struct CycleIterator<A, T> {
-    priv orig: T,
-    priv iter: T,
-}
-
-impl<A, T: Clone + Iterator<A>> Iterator<A> for CycleIterator<A, T> {
-    #[inline]
-    fn next(&mut self) -> Option<A> {
-        match self.iter.next() {
-            None => { self.iter = self.orig.clone(); self.iter.next() }
-            y => y
-        }
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (uint, Option<uint>) {
-        // the cycle iterator is either empty or infinite
-        match self.orig.size_hint() {
-            sz @ (0, Some(0)) => sz,
-            (0, _) => (0, None),
-            _ => (uint::max_value, None)
-        }
-    }
-}
-
 /// An iterator which strings two iterators together
 // FIXME #6967: Dummy A parameter to get around type inference bug
-#[deriving(Clone)]
 pub struct ChainIterator<A, T, U> {
     priv a: T,
     priv b: U,
@@ -838,7 +786,6 @@ for ChainIterator<A, T, U> {
 
 /// An iterator which iterates two other iterators simultaneously
 // FIXME #6967: Dummy A & B parameters to get around type inference bug
-#[deriving(Clone)]
 pub struct ZipIterator<A, T, B, U> {
     priv a: T,
     priv b: U
@@ -992,7 +939,6 @@ for FilterMapIterator<'self, A, B, T> {
 
 /// An iterator which yields the current count and the element during iteration
 // FIXME #6967: Dummy A parameter to get around type inference bug
-#[deriving(Clone)]
 pub struct EnumerateIterator<A, T> {
     priv iter: T,
     priv count: uint
@@ -1091,7 +1037,6 @@ impl<'self, A, T: Iterator<A>> Iterator<A> for TakeWhileIterator<'self, A, T> {
 
 /// An iterator which skips over `n` elements of `iter`.
 // FIXME #6967: Dummy A parameter to get around type inference bug
-#[deriving(Clone)]
 pub struct SkipIterator<A, T> {
     priv iter: T,
     priv n: uint
@@ -1140,7 +1085,6 @@ impl<A, T: Iterator<A>> Iterator<A> for SkipIterator<A, T> {
 
 /// An iterator which only iterates over the first `n` iterations of `iter`.
 // FIXME #6967: Dummy A parameter to get around type inference bug
-#[deriving(Clone)]
 pub struct TakeIterator<A, T> {
     priv iter: T,
     priv n: uint
@@ -1292,7 +1236,6 @@ impl<'self, A, St> Iterator<A> for UnfoldrIterator<'self, A, St> {
 
 /// An infinite iterator starting at `start` and advancing by `step` with each
 /// iteration
-#[deriving(Clone)]
 pub struct Counter<A> {
     /// The current state the counter is at (next value to be yielded)
     state: A,
@@ -1494,20 +1437,6 @@ mod tests {
         assert_eq!(i, 10);
     }
 
-    #[test]
-    fn test_cycle() {
-        let cycle_len = 3;
-        let it = Counter::new(0u,1).take_(cycle_len).cycle();
-        assert_eq!(it.size_hint(), (uint::max_value, None));
-        for it.take_(100).enumerate().advance |(i, x)| {
-            assert_eq!(i % cycle_len, x);
-        }
-
-        let mut it = Counter::new(0u,1).take_(0).cycle();
-        assert_eq!(it.size_hint(), (0, Some(0)));
-        assert_eq!(it.next(), None);
-    }
-
     #[test]
     fn test_iterator_nth() {
         let v = &[0, 1, 2, 3, 4];