---

yaml
---
r: 102351
b: refs/heads/master
c: 4a891fe
h: refs/heads/master
i:
  102349: 1af9d21
  102347: 0764910
  102343: 90447c2
  102335: e685cad
v: v3

Author: nrc

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f1955e028cd3ea5097845f183f8cd099014ac6d8
+refs/heads/master: 4a891fe80dfc5c64d72ddb842751bf410dc7a3a8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/librustc/lib.rs

@@ -27,7 +27,6 @@ This API is completely unstable and subject to change.
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[allow(deprecated)];
 #[feature(macro_rules, globs, struct_variant, managed_boxes)];
 #[feature(quote)];
 

trunk/src/librustc/metadata/cstore.rs

@@ -154,10 +154,15 @@ impl CStore {
             .collect()
     }
 
-    pub fn add_used_library(&self, lib: ~str, kind: NativeLibaryKind) {
+    pub fn add_used_library(&self, lib: ~str, kind: NativeLibaryKind)
+                            -> bool {
         assert!(!lib.is_empty());
         let mut used_libraries = self.used_libraries.borrow_mut();
+        if used_libraries.get().iter().any(|&(ref x, _)| x == &lib) {
+            return false;
+        }
         used_libraries.get().push((lib, kind));
+        true
     }
 
     pub fn get_used_libraries<'a>(&'a self)

trunk/src/libstd/vec.rs

@@ -2311,13 +2311,11 @@ impl<'a,T> MutableVector<'a, T> for &'a mut [T] {
             if mem::size_of::<T>() == 0 {
                 MutItems{ptr: p,
                          end: (p as uint + self.len()) as *mut T,
-                         marker: marker::ContravariantLifetime::<'a>,
-                         marker2: marker::NoPod}
+                         marker: marker::ContravariantLifetime::<'a>}
             } else {
                 MutItems{ptr: p,
                          end: p.offset(self.len() as int),
-                         marker: marker::ContravariantLifetime::<'a>,
-                         marker2: marker::NoPod}
+                         marker: marker::ContravariantLifetime::<'a>}
             }
         }
     }
@@ -2684,23 +2682,15 @@ impl<A> Default for ~[A] {
     fn default() -> ~[A] { ~[] }
 }
 
-/// Immutable slice iterator
-pub struct Items<'a, T> {
-    priv ptr: *T,
-    priv end: *T,
-    priv marker: marker::ContravariantLifetime<'a>
-}
-
-/// Mutable slice iterator
-pub struct MutItems<'a, T> {
-    priv ptr: *mut T,
-    priv end: *mut T,
-    priv marker: marker::ContravariantLifetime<'a>,
-    priv marker2: marker::NoPod
-}
-
 macro_rules! iterator {
     (struct $name:ident -> $ptr:ty, $elem:ty) => {
+        /// An iterator for iterating over a vector.
+        pub struct $name<'a, T> {
+            priv ptr: $ptr,
+            priv end: $ptr,
+            priv marker: marker::ContravariantLifetime<'a>,
+        }
+
         impl<'a, T> Iterator<$elem> for $name<'a, T> {
             #[inline]
             fn next(&mut self) -> Option<$elem> {

trunk/src/libstd/vec_ng.rs

@@ -369,7 +369,6 @@ impl<T> Vec<T> {
     }
 
     #[inline]
-    #[deprecated="Use `xs.iter().map(closure)` instead."]
     pub fn map<U>(&self, f: |t: &T| -> U) -> Vec<U> {
         self.iter().map(f).collect()
     }

trunk/src/libsyntax/ext/expand.rs

@@ -248,7 +248,7 @@ macro_rules! with_exts_frame (
 // When we enter a module, record it, for the sake of `module!`
 pub fn expand_item(it: @ast::Item, fld: &mut MacroExpander)
                    -> SmallVector<@ast::Item> {
-    let mut decorator_items = SmallVector::zero();
+    let mut decorator_items: SmallVector<@ast::Item> = SmallVector::zero();
     for attr in it.attrs.rev_iter() {
         let mname = attr.name();
 
@@ -262,20 +262,21 @@ pub fn expand_item(it: @ast::Item, fld: &mut MacroExpander)
                         span: None
                     }
                 });
+
                 // we'd ideally decorator_items.push_all(expand_item(item, fld)),
                 // but that double-mut-borrows fld
+                let mut items: SmallVector<@ast::Item> = SmallVector::zero();
                 dec_fn(fld.cx, attr.span, attr.node.value, it,
-                       |item| decorator_items.push(item));
+                       |item| items.push(item));
+                decorator_items.extend(&mut items.move_iter()
+                    .flat_map(|item| expand_item(item, fld).move_iter()));
+
                 fld.cx.bt_pop();
             }
             _ => {}
         }
     }
 
-    let decorator_items = decorator_items.move_iter()
-        .flat_map(|item| expand_item(item, fld).move_iter())
-        .collect();
-
     let mut new_items = match it.node {
         ast::ItemMac(..) => expand_item_mac(it, fld),
         ast::ItemMod(_) | ast::ItemForeignMod(_) => {

trunk/src/libsyntax/lib.rs

@@ -30,7 +30,6 @@ This API is completely unstable and subject to change.
 #[allow(unknown_features)];// Note: remove it after a snapshot.
 #[feature(quote)];
 
-#[allow(deprecated)];
 #[deny(non_camel_case_types)];
 
 extern crate serialize;

trunk/src/libsyntax/util/small_vector.rs

@@ -39,6 +39,14 @@ impl<T> FromIterator<T> for SmallVector<T> {
     }
 }
 
+impl<T> Extendable<T> for SmallVector<T> {
+    fn extend<I: Iterator<T>>(&mut self, iter: &mut I) {
+        for val in *iter {
+            self.push(val);
+        }
+    }
+}
+
 impl<T> SmallVector<T> {
     pub fn zero() -> SmallVector<T> {
         Zero