---

yaml
---
r: 178734
b: refs/heads/master
c: c9e1c44
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1d921f557d6d9e509ce0d696d7b2178628989935
+refs/heads/master: c9e1c445dbcbfc9c938488a79ef12595e0f99c8d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 3b2ed14906fd9f9daa27cc7d1dad263d2f5ff450
 refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/src/libcollections/vec_map.rs

@@ -13,8 +13,6 @@
 
 #![allow(missing_docs)]
 
-pub use self::Entry::*;
-
 use core::prelude::*;
 
 use core::cmp::Ordering;
@@ -68,32 +66,6 @@ pub struct VecMap<V> {
     v: Vec<Option<V>>,
 }
 
-/// A view into a single entry in a map, which may either be vacant or occupied.
-#[unstable(feature = "collections",
-           reason = "precise API still under development")]
-pub enum Entry<'a, V:'a> {
-    /// A vacant Entry
-    Vacant(VacantEntry<'a, V>),
-    /// An occupied Entry
-    Occupied(OccupiedEntry<'a, V>),
-}
-
-/// A vacant Entry.
-#[unstable(feature = "collections",
-           reason = "precise API still under development")]
-pub struct VacantEntry<'a, V:'a> {
-    map: &'a mut VecMap<V>,
-    index: usize,
-}
-
-/// An occupied Entry.
-#[unstable(feature = "collections",
-           reason = "precise API still under development")]
-pub struct OccupiedEntry<'a, V:'a> {
-    map: &'a mut VecMap<V>,
-    index: usize,
-}
-
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<V> Default for VecMap<V> {
     #[stable(feature = "rust1", since = "1.0.0")]
@@ -513,119 +485,6 @@ impl<V> VecMap<V> {
         let result = &mut self.v[*key];
         result.take()
     }
-
-    /// Gets the given key's corresponding entry in the map for in-place manipulation.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::collections::VecMap;
-    /// use std::collections::vec_map::Entry;
-    ///
-    /// let mut count: VecMap<u32> = VecMap::new();
-    ///
-    /// // count the number of occurrences of numbers in the vec
-    /// for x in vec![1, 2, 1, 2, 3, 4, 1, 2, 4].iter() {
-    ///     match count.entry(*x) {
-    ///         Entry::Vacant(view) => {
-    ///             view.insert(1);
-    ///         },
-    ///         Entry::Occupied(mut view) => {
-    ///             let v = view.get_mut();
-    ///             *v += 1;
-    ///         },
-    ///     }
-    /// }
-    ///
-    /// assert_eq!(count[1], 3);
-    /// ```
-    #[unstable(feature = "collections",
-               reason = "precise API still under development")]
-    pub fn entry(&mut self, key: usize) -> Entry<V> {
-        // FIXME(Gankro): this is basically the dumbest implementation of
-        // entry possible, because weird non-lexical borrows issues make it
-        // completely insane to do any other way. That said, Entry is a border-line
-        // useless construct on VecMap, so it's hardly a big loss.
-        if self.contains_key(&key) {
-            Occupied(OccupiedEntry {
-                map: self,
-                index: key,
-            })
-        } else {
-            Vacant(VacantEntry {
-                map: self,
-                index: key,
-            })
-        }
-    }
-}
-
-
-impl<'a, V> Entry<'a, V> {
-    #[unstable(feature = "collections",
-               reason = "matches collection reform v2 specification, waiting for dust to settle")]
-    /// Returns a mutable reference to the entry if occupied, or the VacantEntry if vacant
-    pub fn get(self) -> Result<&'a mut V, VacantEntry<'a, V>> {
-        match self {
-            Occupied(entry) => Ok(entry.into_mut()),
-            Vacant(entry) => Err(entry),
-        }
-    }
-}
-
-impl<'a, V> VacantEntry<'a, V> {
-    /// Sets the value of the entry with the VacantEntry's key,
-    /// and returns a mutable reference to it.
-    #[unstable(feature = "collections",
-               reason = "matches collection reform v2 specification, waiting for dust to settle")]
-    pub fn insert(self, value: V) -> &'a mut V {
-        let index = self.index;
-        self.map.insert(index, value);
-        &mut self.map[index]
-    }
-}
-
-impl<'a, V> OccupiedEntry<'a, V> {
-    /// Gets a reference to the value in the entry.
-    #[unstable(feature = "collections",
-               reason = "matches collection reform v2 specification, waiting for dust to settle")]
-    pub fn get(&self) -> &V {
-        let index = self.index;
-        &self.map[index]
-    }
-
-    /// Gets a mutable reference to the value in the entry.
-    #[unstable(feature = "collections",
-               reason = "matches collection reform v2 specification, waiting for dust to settle")]
-    pub fn get_mut(&mut self) -> &mut V {
-        let index = self.index;
-        &mut self.map[index]
-    }
-
-    /// Converts the entry into a mutable reference to its value.
-    #[unstable(feature = "collections",
-               reason = "matches collection reform v2 specification, waiting for dust to settle")]
-    pub fn into_mut(self) -> &'a mut V {
-        let index = self.index;
-        &mut self.map[index]
-    }
-
-    /// Sets the value of the entry with the OccupiedEntry's key,
-    /// and returns the entry's old value.
-    #[unstable(feature = "collections",
-               reason = "matches collection reform v2 specification, waiting for dust to settle")]
-    pub fn insert(&mut self, value: V) -> V {
-        let index = self.index;
-        self.map.insert(index, value).unwrap()
-    }
-
-    /// Takes the value of the entry out of the map, and returns it.
-    #[unstable(feature = "collections",
-               reason = "matches collection reform v2 specification, waiting for dust to settle")]
-    pub fn remove(self) -> V {
-        let index = self.index;
-        self.map.remove(&index).unwrap()
-    }
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -924,7 +783,7 @@ mod test_map {
     use prelude::*;
     use core::hash::{hash, SipHasher};
 
-    use super::{VecMap, Occupied, Vacant};
+    use super::VecMap;
 
     #[test]
     fn test_get_mut() {
@@ -1276,57 +1135,6 @@ mod test_map {
 
         map[4];
     }
-
-    #[test]
-    fn test_entry(){
-        let xs = [(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)];
-
-        let mut map: VecMap<i32> = xs.iter().map(|&x| x).collect();
-
-        // Existing key (insert)
-        match map.entry(1) {
-            Vacant(_) => unreachable!(),
-            Occupied(mut view) => {
-                assert_eq!(view.get(), &10);
-                assert_eq!(view.insert(100), 10);
-            }
-        }
-        assert_eq!(map.get(&1).unwrap(), &100);
-        assert_eq!(map.len(), 6);
-
-
-        // Existing key (update)
-        match map.entry(2) {
-            Vacant(_) => unreachable!(),
-            Occupied(mut view) => {
-                let v = view.get_mut();
-                *v *= 10;
-            }
-        }
-        assert_eq!(map.get(&2).unwrap(), &200);
-        assert_eq!(map.len(), 6);
-
-        // Existing key (take)
-        match map.entry(3) {
-            Vacant(_) => unreachable!(),
-            Occupied(view) => {
-                assert_eq!(view.remove(), 30);
-            }
-        }
-        assert_eq!(map.get(&3), None);
-        assert_eq!(map.len(), 5);
-
-
-        // Inexistent key (insert)
-        match map.entry(10) {
-            Occupied(_) => unreachable!(),
-            Vacant(view) => {
-                assert_eq!(*view.insert(1000), 1000);
-            }
-        }
-        assert_eq!(map.get(&10).unwrap(), &1000);
-        assert_eq!(map.len(), 6);
-    }
 }
 
 #[cfg(test)]

trunk/src/libcore/error.rs

@@ -51,7 +51,7 @@
 //! use std::error::FromError;
 //! use std::old_io::{File, IoError};
 //! use std::os::{MemoryMap, MapError};
-//! use std::old_path::Path;
+//! use std::path::Path;
 //!
 //! enum MyError {
 //!     Io(IoError),

trunk/src/libcore/fmt/mod.rs

@@ -264,7 +264,6 @@ pub trait Show {
 #[lang = "debug_trait"]
 pub trait Debug {
     /// Formats the value using the given formatter.
-    #[stable(feature = "rust1", since = "1.0.0")]
     fn fmt(&self, &mut Formatter) -> Result;
 }
 
@@ -291,7 +290,6 @@ pub trait String {
 #[stable(feature = "rust1", since = "1.0.0")]
 pub trait Display {
     /// Formats the value using the given formatter.
-    #[stable(feature = "rust1", since = "1.0.0")]
     fn fmt(&self, &mut Formatter) -> Result;
 }
 

trunk/src/libcore/iter.rs

@@ -119,7 +119,6 @@ impl<'a, T> Iterator for &'a mut (Iterator<Item=T> + 'a) {
                           built from an iterator over elements of type `{A}`"]
 pub trait FromIterator<A> {
     /// Build a container with elements from an external iterator.
-    #[stable(feature = "rust1", since = "1.0.0")]
     fn from_iter<T: Iterator<Item=A>>(iterator: T) -> Self;
 }
 
@@ -724,12 +723,11 @@ pub trait IteratorExt: Iterator + Sized {
         P: FnMut(Self::Item) -> bool,
         Self: ExactSizeIterator + DoubleEndedIterator
     {
-        let mut i = self.len() - 1;
-        while let Some(v) = self.next_back() {
-            if predicate(v) {
+        let len = self.len();
+        for i in (0..len).rev() {
+            if predicate(self.next_back().expect("rposition: incorrect ExactSizeIterator")) {
                 return Some(i);
             }
-            i -= 1;
         }
         None
     }
@@ -1823,7 +1821,6 @@ impl<I: Iterator> Peekable<I> {
     /// Return a reference to the next element of the iterator with out
     /// advancing it, or None if the iterator is exhausted.
     #[inline]
-    #[stable(feature = "rust1", since = "1.0.0")]
     pub fn peek(&mut self) -> Option<&I::Item> {
         if self.peeked.is_none() {
             self.peeked = self.iter.next();

trunk/src/libgraphviz/maybe_owned_vec.rs

@@ -17,7 +17,7 @@ use std::cmp::Ordering;
 use std::default::Default;
 use std::fmt;
 use std::iter::FromIterator;
-use std::old_path::BytesContainer;
+use std::path::BytesContainer;
 use std::slice;
 
 // Note 1: It is not clear whether the flexibility of providing both