---

yaml
---
r: 152430
b: refs/heads/try2
c: a2bbcb5
h: refs/heads/master
v: v3

Author: Jakub Wieczorek

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

branches/try2/mk/crates.mk

@@ -83,16 +83,16 @@ DEPS_uuid := std serialize
 DEPS_sync := std alloc
 DEPS_getopts := std
 DEPS_collections := core alloc
-DEPS_fourcc := rustc syntax std
-DEPS_hexfloat := rustc syntax std
+DEPS_fourcc := syntax std
+DEPS_hexfloat := syntax std
 DEPS_num := std
 DEPS_test := std getopts serialize term time regex native:rust_test_helpers
 DEPS_time := std serialize sync
 DEPS_rand := core
 DEPS_url := std
 DEPS_log := std sync
 DEPS_regex := std
-DEPS_regex_macros = rustc syntax std regex
+DEPS_regex_macros = syntax std regex
 DEPS_fmt_macros = std
 
 TOOL_DEPS_compiletest := test green rustuv getopts

branches/try2/src/compiletest/compiletest.rs

@@ -18,17 +18,11 @@
 
 extern crate test;
 extern crate getopts;
+#[phase(link, syntax)]
+extern crate log;
 extern crate green;
 extern crate rustuv;
 
-#[cfg(stage0)]
-#[phase(syntax, link)]
-extern crate log;
-
-#[cfg(not(stage0))]
-#[phase(plugin, link)]
-extern crate log;
-
 extern crate regex;
 
 use std::os;
@@ -292,7 +286,6 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
         save_metrics: config.save_metrics.clone(),
         test_shard: config.test_shard.clone(),
         nocapture: false,
-        color: test::AutoColor,
     }
 }
 

branches/try2/src/compiletest/procsrv.rs

@@ -11,7 +11,7 @@
 use std::os;
 use std::str;
 use std::io::process::{ProcessExit, Command, Process, ProcessOutput};
-use std::dynamic_lib::DynamicLibrary;
+use std::unstable::dynamic_lib::DynamicLibrary;
 
 fn target_env(lib_path: &str, prog: &str) -> Vec<(String, String)> {
     let prog = if cfg!(windows) {prog.slice_to(prog.len() - 4)} else {prog};

branches/try2/src/doc/rust.md

@@ -1819,8 +1819,9 @@ type int8_t = i8;
 
 ### Function-only attributes
 
-- `plugin_registrar` - mark this function as the registration point for
-  compiler plugins, such as loadable syntax extensions.
+- `macro_registrar` - when using loadable syntax extensions, mark this
+  function as the registration point for the current crate's syntax
+  extensions.
 - `main` - indicates that this function should be passed to the entry point,
   rather than the function in the crate root named `main`.
 - `start` - indicates that this function should be used as the entry point,
@@ -4097,7 +4098,7 @@ that demonstrates all four of them:
 
 ~~~~
 #![feature(phase)]
-#[phase(plugin, link)] extern crate log;
+#[phase(syntax, link)] extern crate log;
 
 fn main() {
     error!("This is an error log")

branches/try2/src/etc/licenseck.py

@@ -42,7 +42,6 @@
     "libstd/sync/spsc_queue.rs", # BSD
     "libstd/sync/mpmc_bounded_queue.rs", # BSD
     "libsync/mpsc_intrusive.rs", # BSD
-    "test/bench/shootout-fannkuch-redux.rs", # BSD
     "test/bench/shootout-meteor.rs", # BSD
     "test/bench/shootout-regex-dna.rs", # BSD
 ]

branches/try2/src/liballoc/lib.rs

@@ -70,14 +70,8 @@
 #![no_std]
 #![feature(phase)]
 
-#[cfg(stage0)]
 #[phase(syntax, link)]
 extern crate core;
-
-#[cfg(not(stage0))]
-#[phase(plugin, link)]
-extern crate core;
-
 extern crate libc;
 
 
@@ -86,10 +80,8 @@ extern crate libc;
 #[cfg(test)] extern crate debug;
 #[cfg(test)] extern crate sync;
 #[cfg(test)] extern crate native;
-#[cfg(test, stage0)] #[phase(syntax, link)] extern crate std;
-#[cfg(test, stage0)] #[phase(syntax, link)] extern crate log;
-#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate std;
-#[cfg(test, not(stage0))] #[phase(plugin, link)] extern crate log;
+#[cfg(test)] #[phase(syntax, link)] extern crate std;
+#[cfg(test)] #[phase(syntax, link)] extern crate log;
 
 // Heaps provided for low-level allocation strategies
 

branches/try2/src/libcollections/bitv.rs

@@ -13,15 +13,12 @@
 use core::prelude::*;
 
 use core::cmp;
-use core::default::Default;
 use core::fmt;
 use core::iter::{Enumerate, Repeat, Map, Zip};
 use core::ops;
 use core::slice;
 use core::uint;
-use std::hash;
 
-use {Collection, Mutable, Set, MutableSet};
 use vec::Vec;
 
 #[deriving(Clone)]
@@ -37,12 +34,12 @@ fn small_mask(nbits: uint) -> uint {
 }
 
 impl SmallBitv {
-    fn new(bits: uint) -> SmallBitv {
+    pub fn new(bits: uint) -> SmallBitv {
         SmallBitv {bits: bits}
     }
 
     #[inline]
-    fn bits_op(&mut self,
+    pub fn bits_op(&mut self,
                    right_bits: uint,
                    nbits: uint,
                    f: |uint, uint| -> uint)
@@ -55,32 +52,32 @@ impl SmallBitv {
     }
 
     #[inline]
-    fn union(&mut self, s: &SmallBitv, nbits: uint) -> bool {
+    pub fn union(&mut self, s: &SmallBitv, nbits: uint) -> bool {
         self.bits_op(s.bits, nbits, |u1, u2| u1 | u2)
     }
 
     #[inline]
-    fn intersect(&mut self, s: &SmallBitv, nbits: uint) -> bool {
+    pub fn intersect(&mut self, s: &SmallBitv, nbits: uint) -> bool {
         self.bits_op(s.bits, nbits, |u1, u2| u1 & u2)
     }
 
     #[inline]
-    fn become(&mut self, s: &SmallBitv, nbits: uint) -> bool {
+    pub fn become(&mut self, s: &SmallBitv, nbits: uint) -> bool {
         self.bits_op(s.bits, nbits, |_u1, u2| u2)
     }
 
     #[inline]
-    fn difference(&mut self, s: &SmallBitv, nbits: uint) -> bool {
+    pub fn difference(&mut self, s: &SmallBitv, nbits: uint) -> bool {
         self.bits_op(s.bits, nbits, |u1, u2| u1 & !u2)
     }
 
     #[inline]
-    fn get(&self, i: uint) -> bool {
+    pub fn get(&self, i: uint) -> bool {
         (self.bits & (1 << i)) != 0
     }
 
     #[inline]
-    fn set(&mut self, i: uint, x: bool) {
+    pub fn set(&mut self, i: uint, x: bool) {
         if x {
             self.bits |= 1<<i;
         }
@@ -90,29 +87,29 @@ impl SmallBitv {
     }
 
     #[inline]
-    fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
+    pub fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
         let mask = small_mask(nbits);
         mask & self.bits == mask & b.bits
     }
 
     #[inline]
-    fn clear(&mut self) { self.bits = 0; }
+    pub fn clear(&mut self) { self.bits = 0; }
 
     #[inline]
-    fn set_all(&mut self) { self.bits = !0; }
+    pub fn set_all(&mut self) { self.bits = !0; }
 
     #[inline]
-    fn all(&self, nbits: uint) -> bool {
+    pub fn all(&self, nbits: uint) -> bool {
         small_mask(nbits) & !self.bits == 0
     }
 
     #[inline]
-    fn none(&self, nbits: uint) -> bool {
+    pub fn none(&self, nbits: uint) -> bool {
         small_mask(nbits) & self.bits == 0
     }
 
     #[inline]
-    fn negate(&mut self) { self.bits = !self.bits; }
+    pub fn negate(&mut self) { self.bits = !self.bits; }
 }
 
 #[deriving(Clone)]
@@ -137,12 +134,12 @@ fn big_mask(nbits: uint, elem: uint) -> uint {
 }
 
 impl BigBitv {
-    fn new(storage: Vec<uint>) -> BigBitv {
+    pub fn new(storage: Vec<uint>) -> BigBitv {
         BigBitv {storage: storage}
     }
 
     #[inline]
-    fn process(&mut self,
+    pub fn process(&mut self,
                    b: &BigBitv,
                    nbits: uint,
                    op: |uint, uint| -> uint)
@@ -166,45 +163,45 @@ impl BigBitv {
     }
 
     #[inline]
-    fn each_storage(&mut self, op: |v: &mut uint| -> bool) -> bool {
+    pub fn each_storage(&mut self, op: |v: &mut uint| -> bool) -> bool {
         self.storage.mut_iter().advance(|elt| op(elt))
     }
 
     #[inline]
-    fn negate(&mut self) {
+    pub fn negate(&mut self) {
         self.each_storage(|w| { *w = !*w; true });
     }
 
     #[inline]
-    fn union(&mut self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn union(&mut self, b: &BigBitv, nbits: uint) -> bool {
         self.process(b, nbits, |w1, w2| w1 | w2)
     }
 
     #[inline]
-    fn intersect(&mut self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn intersect(&mut self, b: &BigBitv, nbits: uint) -> bool {
         self.process(b, nbits, |w1, w2| w1 & w2)
     }
 
     #[inline]
-    fn become(&mut self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn become(&mut self, b: &BigBitv, nbits: uint) -> bool {
         self.process(b, nbits, |_, w| w)
     }
 
     #[inline]
-    fn difference(&mut self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn difference(&mut self, b: &BigBitv, nbits: uint) -> bool {
         self.process(b, nbits, |w1, w2| w1 & !w2)
     }
 
     #[inline]
-    fn get(&self, i: uint) -> bool {
+    pub fn get(&self, i: uint) -> bool {
         let w = i / uint::BITS;
         let b = i % uint::BITS;
         let x = 1 & self.storage.get(w) >> b;
         x == 1
     }
 
     #[inline]
-    fn set(&mut self, i: uint, x: bool) {
+    pub fn set(&mut self, i: uint, x: bool) {
         let w = i / uint::BITS;
         let b = i % uint::BITS;
         let flag = 1 << b;
@@ -213,7 +210,7 @@ impl BigBitv {
     }
 
     #[inline]
-    fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
         for (i, elt) in b.storage.iter().enumerate() {
             let mask = big_mask(nbits, i);
             if mask & *self.storage.get(i) != mask & *elt {
@@ -599,20 +596,6 @@ impl fmt::Show for Bitv {
     }
 }
 
-impl<S: hash::Writer> hash::Hash<S> for Bitv {
-    fn hash(&self, state: &mut S) {
-        self.nbits.hash(state);
-        match self.rep {
-            Small(ref s) => (s.bits & small_mask(self.nbits)).hash(state),
-            Big(ref b) => {
-                for (i, ele) in b.storage.iter().enumerate() {
-                    (ele & big_mask(self.nbits, i)).hash(state);
-                }
-            }
-        }
-    }
-}
-
 #[inline]
 fn iterate_bits(base: uint, bits: uint, f: |uint| -> bool) -> bool {
     if bits == 0 {
@@ -699,11 +682,6 @@ pub struct BitvSet {
     bitv: BigBitv
 }
 
-impl Default for BitvSet {
-    #[inline]
-    fn default() -> BitvSet { BitvSet::new() }
-}
-
 impl BitvSet {
     /// Creates a new bit vector set with initially no contents
     pub fn new() -> BitvSet {
@@ -856,15 +834,7 @@ impl fmt::Show for BitvSet {
     }
 }
 
-impl<S: hash::Writer> hash::Hash<S> for BitvSet {
-    fn hash(&self, state: &mut S) {
-        for pos in self.iter() {
-            pos.hash(state);
-        }
-    }
-}
-
-impl Collection for BitvSet {
+impl Container for BitvSet {
     #[inline]
     fn len(&self) -> uint { self.size }
 }
@@ -1015,7 +985,6 @@ mod tests {
     use std::rand::Rng;
     use test::Bencher;
 
-    use {Set, Mutable, MutableSet};
     use bitv::{Bitv, SmallBitv, BigBitv, BitvSet, from_bools, from_fn,
                from_bytes};
     use bitv;

branches/try2/src/libcollections/btree.rs

@@ -24,7 +24,6 @@ use alloc::owned::Box;
 use core::fmt;
 use core::fmt::Show;
 
-use Collection;
 use vec::Vec;
 
 #[allow(missing_doc)]