---

yaml
---
r: 149088
b: refs/heads/try2
c: 47ece1f
h: refs/heads/master
v: v3

Author: alexcrichton

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

branches/try2/Makefile.in

@@ -140,7 +140,8 @@ endif
 # snapshot will be generated with a statically linked rustc so we only have to
 # worry about the distribution of one file (with its native dynamic
 # dependencies)
-RUSTFLAGS_STAGE0 += -Z prefer-dynamic
+#
+# NOTE: after a snapshot (stage0), put this on stage0 as well
 RUSTFLAGS_STAGE1 += -C prefer-dynamic
 
 # platform-specific auto-configuration

branches/try2/mk/crates.mk

@@ -50,8 +50,8 @@
 ################################################################################
 
 TARGET_CRATES := std extra green rustuv native flate arena glob term semver \
-                 uuid serialize sync getopts collections num
-HOST_CRATES := syntax rustc rustdoc fourcc
+                 uuid serialize sync getopts collections fourcc
+HOST_CRATES := syntax rustc rustdoc
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
 
@@ -75,7 +75,6 @@ DEPS_sync := std
 DEPS_getopts := std
 DEPS_collections := std serialize
 DEPS_fourcc := syntax std
-DEPS_num := std extra
 
 TOOL_DEPS_compiletest := extra green rustuv getopts
 TOOL_DEPS_rustdoc := rustdoc green rustuv

branches/try2/src/doc/index.md

@@ -38,7 +38,6 @@ li {list-style-type: none; }
 * [The Rust compiler, `librustc`](rustc/index.html)
 
 * [The `arena` allocation library](arena/index.html)
-* [The `num` arbitrary precision numerics library](num/index.html)
 * [The `collections` library](collections/index.html)
 * [The `flate` compression library](flate/index.html)
 * [The `fourcc` four-character code library](fourcc/index.html)

branches/try2/src/doc/tutorial.md

@@ -3026,12 +3026,12 @@ In Rust terminology, we need a way to refer to other crates.
 For that, Rust offers you the `extern mod` declaration:
 
 ~~~
-extern mod num;
-// `num` ships with Rust (much like `extra`; more details further down).
+extern mod extra;
+// extra ships with Rust, you'll find more details further down.
 
 fn main() {
     // The rational number '1/2':
-    let one_half = ::num::rational::Ratio::new(1, 2);
+    let one_half = ::extra::rational::Ratio::new(1, 2);
 }
 ~~~
 
@@ -3056,10 +3056,10 @@ of both `use` and local declarations.
 Which can result in something like this:
 
 ~~~
-extern mod num;
+extern mod extra;
 
 use farm::dog;
-use num::rational::Ratio;
+use extra::rational::Ratio;
 
 mod farm {
     pub fn dog() { println!("woof"); }
@@ -3224,9 +3224,9 @@ See the [API documentation][stddoc] for details.
 
 ## The extra library
 
-Rust ships with crates such as the [extra library], an accumulation of useful things,
+Rust also ships with the [extra library], an accumulation of useful things,
 that are however not important enough to deserve a place in the standard
-library.  You can link to a library such as `extra` with an `extern mod extra;`.
+library.  You can use them by linking to `extra` with an `extern mod extra;`.
 
 [extra library]: extra/index.html
 

branches/try2/src/libextra/lib.rs

@@ -62,6 +62,12 @@ pub mod time;
 pub mod base64;
 pub mod workcache;
 pub mod enum_set;
+#[path="num/bigint.rs"]
+pub mod bigint;
+#[path="num/rational.rs"]
+pub mod rational;
+#[path="num/complex.rs"]
+pub mod complex;
 pub mod stats;
 pub mod hex;
 

branches/try2/src/libnum/bigint.rs renamed to branches/try2/src/libextra/num/bigint.rs

@@ -16,6 +16,9 @@ A `BigUint` is represented as an array of `BigDigit`s.
 A `BigInt` is a combination of `BigUint` and `Sign`.
 */
 
+#[allow(missing_doc)];
+#[allow(non_uppercase_statics)];
+
 use std::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
 use std::num;
 use std::num::{Zero, One, ToStrRadix, FromStrRadix, Orderable};
@@ -45,7 +48,7 @@ pub type BigDigit = u32;
 pub static ZERO_BIG_DIGIT: BigDigit = 0;
 
 pub mod BigDigit {
-    use super::BigDigit;
+    use bigint::BigDigit;
 
     #[cfg(target_word_size = "32")]
     pub static bits: uint = 16;
@@ -1430,8 +1433,8 @@ impl BigInt {
 
 #[cfg(test)]
 mod biguint_tests {
-    use super::{BigDigit, BigUint, ToBigUint};
-    use super::{Plus, BigInt, RandBigInt, ToBigInt};
+    use super::*;
+    use super::RandBigInt;
 
     use std::cmp::{Less, Equal, Greater};
     use std::i64;
@@ -2087,8 +2090,8 @@ mod biguint_tests {
 
 #[cfg(test)]
 mod bigint_tests {
-    use super::{BigDigit, BigUint, ToBigUint};
-    use super::{Sign, Minus, Zero, Plus, BigInt, RandBigInt, ToBigInt};
+    use super::*;
+    use super::RandBigInt;
 
     use std::cmp::{Less, Equal, Greater};
     use std::i64;
@@ -2588,7 +2591,7 @@ mod bigint_tests {
 
 #[cfg(test)]
 mod bench {
-    use super::{BigInt, BigUint};
+    use super::*;
     use std::iter;
     use std::mem::replace;
     use std::num::{FromPrimitive, Zero, One};

branches/try2/src/libnum/complex.rs renamed to branches/try2/src/libextra/num/complex.rs

@@ -191,7 +191,7 @@ impl<T: ToStrRadix + Num + Ord> ToStrRadix for Cmplx<T> {
 mod test {
     #[allow(non_uppercase_statics)];
 
-    use super::{Complex64, Cmplx};
+    use super::*;
     use std::num::{Zero,One,Real};
 
     pub static _0_0i : Complex64 = Cmplx { re: 0.0, im: 0.0 };
@@ -285,7 +285,7 @@ mod test {
     }
 
     mod arith {
-        use super::{_0_0i, _1_0i, _1_1i, _0_1i, _neg1_1i, _05_05i, all_consts};
+        use super::*;
         use std::num::Zero;
 
         #[test]

branches/try2/src/libnum/rational.rs renamed to branches/try2/src/libextra/num/rational.rs

@@ -1,4 +1,4 @@
-// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -10,10 +10,11 @@
 
 //! Rational numbers
 
+
 use std::cmp;
 use std::from_str::FromStr;
 use std::num::{Zero,One,ToStrRadix,FromStrRadix,Round};
-use bigint::{BigInt, BigUint, Sign, Plus, Minus};
+use super::bigint::{BigInt, BigUint, Sign, Plus, Minus};
 
 /// Represents the ratio between 2 numbers.
 #[deriving(Clone)]
@@ -348,7 +349,7 @@ impl<T: FromStrRadix + Clone + Integer + Ord>
 #[cfg(test)]
 mod test {
 
-    use super::{Ratio, Rational, BigRational};
+    use super::*;
     use std::num::{Zero,One,FromStrRadix,FromPrimitive};
     use std::from_str::FromStr;
 
@@ -448,8 +449,8 @@ mod test {
 
 
     mod arith {
-        use super::{_0, _1, _2, _1_2, _3_2, _neg1_2, to_big};
-        use super::super::{Ratio, Rational, BigRational};
+        use super::*;
+        use super::super::*;
 
 
         #[test]

branches/try2/src/libnum/lib.rs

@@ -1085,7 +1085,7 @@ pub fn build_output_filenames(input: &Input,
             // We want to toss everything after the final '.'
             let dirpath = match *odir {
                 Some(ref d) => d.clone(),
-                None => Path::new(".")
+                None => os::getcwd(),
             };
 
             let mut stem = match *input {

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

@@ -394,20 +394,15 @@ pub fn expand_item_mac(it: @ast::Item, fld: &mut MacroExpander)
 pub fn expand_view_item(vi: &ast::ViewItem,
                         fld: &mut MacroExpander)
                         -> ast::ViewItem {
-    match vi.node {
-        ast::ViewItemExternMod(..) => {
-            let should_load = vi.attrs.iter().any(|attr| {
-                attr.name().get() == "phase" &&
-                    attr.meta_item_list().map_or(false, |phases| {
-                        attr::contains_name(phases, "syntax")
-                    })
-            });
+    let should_load = vi.attrs.iter().any(|attr| {
+        attr.name().get() == "phase" &&
+            attr.meta_item_list().map_or(false, |phases| {
+                attr::contains_name(phases, "syntax")
+            })
+    });
 
-            if should_load {
-                load_extern_macros(vi, fld);
-            }
-        }
-        ast::ViewItemUse(_) => {}
+    if should_load {
+        load_extern_macros(vi, fld);
     }
 
     noop_fold_view_item(vi, fld)

branches/try2/src/libsyntax/ext/expand.rs

@@ -492,7 +492,6 @@ declare_special_idents_and_keywords! {
         (53,                         Typeof,     "typeof");
         (54,                         Unsized,    "unsized");
         (55,                         Yield,      "yield");
-        (56,                         Do,         "do");
     }
 }
 

branches/try2/src/libsyntax/parse/token.rs

@@ -8,13 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod num;
+extern mod extra;
 
 use std::from_str::FromStr;
 use std::num::One;
 use std::num::Zero;
 use std::num::FromPrimitive;
-use num::bigint::BigInt;
+use extra::bigint::BigInt;
 
 struct Context {
     numer: BigInt,

branches/try2/src/test/bench/shootout-pidigits.rs

@@ -23,7 +23,7 @@ impl Drop for Temporary {
 }
 
 impl Temporary {
-    fn do_stuff(&self) -> bool {true}
+    fn do(&self) -> bool {true}
 }
 
 fn borrow() -> ~Temporary { ~Temporary }
@@ -35,7 +35,7 @@ pub fn main() {
     // This loop's condition
     // should call `Temporary`'s
     // `drop` 6 times.
-    while borrow().do_stuff() {
+    while borrow().do() {
         i += 1;
         if i > 5 {
             break;
@@ -44,7 +44,7 @@ pub fn main() {
 
     // This if condition should
     // call it 1 time
-    if borrow().do_stuff() {
+    if borrow().do() {
         unsafe { assert_eq!(DROPPED, 7) }
     }
 }