---

yaml
---
r: 149478
b: refs/heads/try2
c: 4d10bdc
h: refs/heads/master
v: v3

Author: brson

[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: c250c16f81f82a21295e421be7bd47c91d64cb2a
+refs/heads/try2: 4d10bdc5b9fecee38abcad78a86e552a961b1a0a
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/crates.mk

@@ -69,7 +69,7 @@ DEPS_flate := std native:miniz
 DEPS_arena := std collections
 DEPS_glob := std
 DEPS_serialize := std
-DEPS_term := std collections
+DEPS_term := std
 DEPS_semver := std
 DEPS_uuid := std serialize
 DEPS_sync := std

branches/try2/src/doc/rust.md

@@ -467,7 +467,7 @@ expression context, the final namespace qualifier is omitted.
 Two examples of paths with type arguments:
 
 ~~~~
-# struct HashMap<K, V>;
+# use std::hashmap::HashMap;
 # fn f() {
 # fn id<T>(t: T) -> T { t }
 type T = HashMap<int,~str>;  // Type arguments used in a type expression

branches/try2/src/doc/tutorial.md

@@ -1977,8 +1977,8 @@ illegal to copy and pass by value.
 Generic `type`, `struct`, and `enum` declarations follow the same pattern:
 
 ~~~~
-extern crate collections;
-type Set<T> = collections::HashMap<T, ()>;
+use std::hashmap::HashMap;
+type Set<T> = HashMap<T, ()>;
 
 struct Stack<T> {
     elements: ~[T]
@@ -1988,7 +1988,6 @@ enum Option<T> {
     Some(T),
     None
 }
-# fn main() {}
 ~~~~
 
 These declarations can be instantiated to valid types like `Set<int>`,

branches/try2/src/etc/combine-tests.py

@@ -55,8 +55,6 @@ def scrub(b):
 #[crate_id=\"run_pass_stage2#0.1\"];
 #[feature(globs, macro_rules, struct_variant, managed_boxes)];
 #[allow(warnings)];
-extern crate collections;
-extern crate extra;
 """
 )
 for t in stage2_tests:

branches/try2/src/libarena/lib.rs

@@ -37,8 +37,8 @@ use std::num;
 use std::kinds::marker;
 use std::rc::Rc;
 use std::rt::global_heap;
-use std::unstable::intrinsics::{TyDesc, get_tydesc};
-use std::unstable::intrinsics;
+use std::intrinsics::{TyDesc, get_tydesc};
+use std::intrinsics;
 use std::vec;
 
 // The way arena uses arrays is really deeply awful. The arrays are

branches/try2/src/libcollections/lib.rs

@@ -27,25 +27,21 @@ pub use btree::BTree;
 pub use deque::Deque;
 pub use dlist::DList;
 pub use enum_set::EnumSet;
-pub use hashmap::{HashMap, HashSet};
 pub use list::List;
 pub use lru_cache::LruCache;
 pub use priority_queue::PriorityQueue;
 pub use ringbuf::RingBuf;
 pub use smallintmap::SmallIntMap;
 pub use treemap::{TreeMap, TreeSet};
-pub use trie::{TrieMap, TrieSet};
 
 pub mod bitv;
 pub mod btree;
 pub mod deque;
 pub mod dlist;
 pub mod enum_set;
-pub mod hashmap;
 pub mod list;
 pub mod lru_cache;
 pub mod priority_queue;
 pub mod ringbuf;
 pub mod smallintmap;
 pub mod treemap;
-pub mod trie;

branches/try2/src/libcollections/lru_cache.rs

@@ -38,12 +38,11 @@
 //! ```
 
 use std::container::Container;
+use std::hashmap::HashMap;
 use std::to_bytes::Cb;
 use std::ptr;
 use std::cast;
 
-use HashMap;
-
 struct KeyRef<K> { k: *K }
 
 struct LruEntry<K, V> {

branches/try2/src/libextra/json.rs

@@ -235,7 +235,7 @@ fn main() {
 
 use std::char;
 use std::f64;
-use collections::HashMap;
+use std::hashmap::HashMap;
 use std::io;
 use std::io::MemWriter;
 use std::num;

branches/try2/src/libextra/stats.rs

@@ -12,10 +12,10 @@
 
 use std::cmp;
 use std::hash_old::Hash;
+use std::hashmap;
 use std::io;
 use std::mem;
 use std::num;
-use collections::hashmap;
 
 // NB: this can probably be rewritten in terms of num::Num
 // to be less f64-specific.

branches/try2/src/libextra/url.rs

@@ -14,7 +14,7 @@
 
 use std::io::BufReader;
 use std::cmp::Eq;
-use collections::HashMap;
+use std::hashmap::HashMap;
 use std::to_bytes;
 use std::uint;
 
@@ -957,7 +957,7 @@ mod tests {
 
     use super::*;
 
-    use collections::HashMap;
+    use std::hashmap::HashMap;
 
     #[test]
     fn test_url_parse() {

branches/try2/src/libgreen/macros.rs

@@ -124,7 +124,7 @@ memory and partly incapable of presentation to others.",
     abort();
 
     fn abort() -> ! {
-        use std::unstable::intrinsics;
+        use std::intrinsics;
         unsafe { intrinsics::abort() }
     }
 }

branches/try2/src/libnative/io/pipe_unix.rs

@@ -15,7 +15,7 @@ use std::libc;
 use std::mem;
 use std::rt::rtio;
 use std::sync::arc::UnsafeArc;
-use std::unstable::intrinsics;
+use std::intrinsics;
 
 use super::{IoResult, retry};
 use super::file::{keep_going, fd_t};

branches/try2/src/libnative/io/pipe_win32.rs

@@ -90,7 +90,7 @@ use std::os::win32::as_utf16_p;
 use std::ptr;
 use std::rt::rtio;
 use std::sync::arc::UnsafeArc;
-use std::unstable::intrinsics;
+use std::intrinsics;
 
 use super::IoResult;
 

branches/try2/src/libnative/io/timer_other.rs

@@ -49,6 +49,7 @@
 #[allow(non_camel_case_types)];
 
 use std::comm::Data;
+use std::hashmap::HashMap;
 use std::libc;
 use std::mem;
 use std::os;
@@ -104,7 +105,7 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
     // sorted list, and dead timers are those which have expired, but ownership
     // hasn't yet been transferred back to the timer itself.
     let mut active: ~[~Inner] = ~[];
-    let mut dead = ~[];
+    let mut dead = HashMap::new();
 
     // inserts a timer into an array of timers (sorted by firing time)
     fn insert(t: ~Inner, active: &mut ~[~Inner]) {
@@ -115,7 +116,7 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
     }
 
     // signals the first requests in the queue, possible re-enqueueing it.
-    fn signal(active: &mut ~[~Inner], dead: &mut ~[(uint, ~Inner)]) {
+    fn signal(active: &mut ~[~Inner], dead: &mut HashMap<uint, ~Inner>) {
         let mut timer = match active.shift() {
             Some(timer) => timer, None => return
         };
@@ -126,7 +127,7 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
             insert(timer, active);
         } else {
             drop(chan);
-            dead.push((timer.id, timer));
+            dead.insert(timer.id, timer);
         }
     }
 
@@ -171,12 +172,8 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
                         Data(NewTimer(timer)) => insert(timer, &mut active),
 
                         Data(RemoveTimer(id, ack)) => {
-                            match dead.iter().position(|&(i, _)| id == i) {
-                                Some(i) => {
-                                    let (_, i) = dead.remove(i).unwrap();
-                                    ack.send(i);
-                                    continue
-                                }
+                            match dead.pop(&id) {
+                                Some(i) => { ack.send(i); continue }
                                 None => {}
                             }
                             let i = active.iter().position(|i| i.id == id);

branches/try2/src/libnative/io/timer_timerfd.rs

@@ -35,6 +35,7 @@ use std::libc;
 use std::ptr;
 use std::os;
 use std::rt::rtio;
+use std::hashmap::HashMap;
 use std::mem;
 
 use io::file::FileDesc;
@@ -77,7 +78,7 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
 
     add(efd, input);
     let events: [imp::epoll_event, ..16] = unsafe { mem::init() };
-    let mut list: ~[(libc::c_int, Chan<()>, bool)] = ~[];
+    let mut map: HashMap<libc::c_int, (Chan<()>, bool)> = HashMap::new();
     'outer: loop {
         let n = match unsafe {
             imp::epoll_wait(efd, events.as_ptr(),
@@ -106,17 +107,13 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
                 // FIXME: should this perform a send() this number of
                 //      times?
                 let _ = FileDesc::new(fd, false).inner_read(bits).unwrap();
-                let (remove, i) = {
-                    match list.bsearch(|&(f, _, _)| f.cmp(&fd)) {
-                        Some(i) => {
-                            let (_, ref c, oneshot) = list[i];
-                            (!c.try_send(()) || oneshot, i)
-                        }
-                        None => fail!("fd not active: {}", fd),
+                let remove = {
+                    match map.find(&fd).expect("fd unregistered") {
+                        &(ref c, oneshot) => !c.try_send(()) || oneshot
                     }
                 };
                 if remove {
-                    drop(list.remove(i));
+                    map.remove(&fd);
                     del(efd, fd);
                 }
             }
@@ -131,17 +128,8 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
 
                     // If we haven't previously seen the file descriptor, then
                     // we need to add it to the epoll set.
-                    match list.bsearch(|&(f, _, _)| f.cmp(&fd)) {
-                        Some(i) => {
-                            drop(mem::replace(&mut list[i], (fd, chan, one)));
-                        }
-                        None => {
-                            match list.iter().position(|&(f, _, _)| f >= fd) {
-                                Some(i) => list.insert(i, (fd, chan, one)),
-                                None => list.push((fd, chan, one)),
-                            }
-                            add(efd, fd);
-                        }
+                    if map.insert(fd, (chan, one)) {
+                        add(efd, fd);
                     }
 
                     // Update the timerfd's time value now that we have control
@@ -153,18 +141,14 @@ fn helper(input: libc::c_int, messages: Port<Req>) {
                 }
 
                 Data(RemoveTimer(fd, chan)) => {
-                    match list.bsearch(|&(f, _, _)| f.cmp(&fd)) {
-                        Some(i) => {
-                            drop(list.remove(i));
-                            del(efd, fd);
-                        }
-                        None => {}
+                    if map.remove(&fd) {
+                        del(efd, fd);
                     }
                     chan.send(());
                 }
 
                 Data(Shutdown) => {
-                    assert!(list.len() == 0);
+                    assert!(map.len() == 0);
                     break 'outer;
                 }
 

branches/try2/src/librustc/back/rpath.rs

@@ -13,7 +13,7 @@ use driver::session;
 use metadata::cstore;
 use metadata::filesearch;
 
-use collections::HashSet;
+use std::hashmap::HashSet;
 use std::{os, vec};
 use syntax::abi;
 

branches/try2/src/librustc/driver/driver.rs

@@ -31,12 +31,12 @@ use extra::json;
 use serialize::Encodable;
 
 use std::cell::{Cell, RefCell};
+use std::hashmap::{HashMap,HashSet};
 use std::io;
 use std::io::fs;
 use std::io::MemReader;
 use std::os;
 use std::vec;
-use collections::{HashMap, HashSet};
 use getopts::{optopt, optmulti, optflag, optflagopt};
 use getopts;
 use syntax::ast;

branches/try2/src/librustc/driver/session.rs

@@ -26,7 +26,7 @@ use syntax::{abi, ast, codemap};
 use syntax;
 
 use std::cell::{Cell, RefCell};
-use collections::{HashMap,HashSet};
+use std::hashmap::{HashMap,HashSet};
 
 pub struct Config {
     os: abi::Os,

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

@@ -13,7 +13,7 @@
 
 use std::c_str::ToCStr;
 use std::cell::RefCell;
-use collections::HashMap;
+use std::hashmap::HashMap;
 use std::libc::{c_uint, c_ushort, c_void, free};
 use std::str::raw::from_c_str;
 

branches/try2/src/librustc/metadata/creader.rs

@@ -21,7 +21,7 @@ use metadata::loader;
 use metadata::loader::Os;
 
 use std::cell::RefCell;
-use collections::HashMap;
+use std::hashmap::HashMap;
 use syntax::ast;
 use syntax::abi;
 use syntax::attr;

branches/try2/src/librustc/metadata/cstore.rs

@@ -17,7 +17,7 @@ use metadata::decoder;
 use metadata::loader;
 
 use std::cell::RefCell;
-use collections::HashMap;
+use std::hashmap::HashMap;
 use syntax::ast;
 use syntax::parse::token::IdentInterner;
 

branches/try2/src/librustc/metadata/encoder.rs

@@ -27,9 +27,9 @@ use serialize::Encodable;
 use std::cast;
 use std::cell::{Cell, RefCell};
 use std::hash_old::Hash;
+use std::hashmap::{HashMap, HashSet};
 use std::io::MemWriter;
 use std::str;
-use collections::{HashMap, HashSet};
 use syntax::abi::AbiSet;
 use syntax::ast::*;
 use syntax::ast;

branches/try2/src/librustc/metadata/filesearch.rs

@@ -14,7 +14,7 @@ use std::cell::RefCell;
 use std::option;
 use std::os;
 use std::io::fs;
-use collections::HashSet;
+use std::hashmap::HashSet;
 
 pub enum FileMatch { FileMatches, FileDoesntMatch }
 

branches/try2/src/librustc/metadata/loader.rs

@@ -26,13 +26,13 @@ use syntax::attr::AttrMetaMethods;
 
 use std::c_str::ToCStr;
 use std::cast;
+use std::hashmap::{HashMap, HashSet};
 use std::cmp;
 use std::io;
 use std::os::consts::{macos, freebsd, linux, android, win32};
 use std::str;
 use std::vec;
 
-use collections::{HashMap, HashSet};
 use flate;
 use time;