---

yaml
---
r: 57202
b: refs/heads/try
c: 64412ec
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
-refs/heads/try: ad0b337036f2f9076852d5d6701ec302e3cce101
+refs/heads/try: 64412eca10399d64d25346d5f8220c1b1f88cd29
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/num/f32.rs

@@ -12,7 +12,7 @@
 
 use from_str;
 use libc::c_int;
-use num::{Zero, One, strconv};
+use num::strconv;
 use prelude::*;
 
 pub use cmath::c_float_targ_consts::*;
@@ -154,6 +154,12 @@ pub fn gt(x: f32, y: f32) -> bool { return x > y; }
 // FIXME (#1999): replace the predicates below with llvm intrinsics or
 // calls to the libmath macros in the rust runtime for performance.
 
+/// Returns true if `x` is a zero number (positive or negative zero)
+#[inline(always)]
+pub fn is_zero(x: f32) -> bool {
+    return x == 0.0f32 || x == -0.0f32;
+}
+
 /// Returns true if `x`is an infinite number
 #[inline(always)]
 pub fn is_infinite(x: f32) -> bool {
@@ -239,16 +245,12 @@ impl Ord for f32 {
     fn gt(&self, other: &f32) -> bool { (*self) > (*other) }
 }
 
-impl Zero for f32 {
+impl num::Zero for f32 {
     #[inline(always)]
     fn zero() -> f32 { 0.0 }
-
-    /// Returns true if the number is equal to either `0.0` or `-0.0`
-    #[inline(always)]
-    fn is_zero(&self) -> bool { *self == 0.0 || *self == -0.0 }
 }
 
-impl One for f32 {
+impl num::One for f32 {
     #[inline(always)]
     fn one() -> f32 { 1.0 }
 }

branches/try/src/libcore/num/f64.rs

@@ -12,7 +12,7 @@
 
 use from_str;
 use libc::c_int;
-use num::{Zero, One, strconv};
+use num::strconv;
 use prelude::*;
 
 pub use cmath::c_double_targ_consts::*;
@@ -174,6 +174,12 @@ pub fn ge(x: f64, y: f64) -> bool { return x >= y; }
 #[inline(always)]
 pub fn gt(x: f64, y: f64) -> bool { return x > y; }
 
+/// Returns true if `x` is a zero number (positive or negative zero)
+#[inline(always)]
+pub fn is_zero(x: f64) -> bool {
+    return x == 0.0f64 || x == -0.0f64;
+}
+
 /// Returns true if `x`is an infinite number
 #[inline(always)]
 pub fn is_infinite(x: f64) -> bool {
@@ -260,16 +266,12 @@ impl Ord for f64 {
     fn gt(&self, other: &f64) -> bool { (*self) > (*other) }
 }
 
-impl Zero for f64 {
+impl num::Zero for f64 {
     #[inline(always)]
     fn zero() -> f64 { 0.0 }
-
-    /// Returns true if the number is equal to either `0.0` or `-0.0`
-    #[inline(always)]
-    fn is_zero(&self) -> bool { *self == 0.0 || *self == -0.0 }
 }
 
-impl One for f64 {
+impl num::One for f64 {
     #[inline(always)]
     fn one() -> f64 { 1.0 }
 }

branches/try/src/libcore/num/float.rs

@@ -22,7 +22,7 @@
 
 use from_str;
 use libc::c_int;
-use num::{Zero, One, strconv};
+use num::strconv;
 use prelude::*;
 
 pub use f64::{add, sub, mul, quot, rem, lt, le, eq, ne, ge, gt};
@@ -337,6 +337,8 @@ pub fn pow_with_uint(base: uint, pow: uint) -> float {
     return total;
 }
 
+#[inline(always)]
+pub fn is_zero(x: float) -> bool { f64::is_zero(x as f64) }
 #[inline(always)]
 pub fn is_infinite(x: float) -> bool { f64::is_infinite(x as f64) }
 #[inline(always)]
@@ -391,16 +393,12 @@ impl Ord for float {
     fn gt(&self, other: &float) -> bool { (*self) > (*other) }
 }
 
-impl Zero for float {
+impl num::Zero for float {
     #[inline(always)]
     fn zero() -> float { 0.0 }
-
-    /// Returns true if the number is equal to either `0.0` or `-0.0`
-    #[inline(always)]
-    fn is_zero(&self) -> bool { *self == 0.0 || *self == -0.0 }
 }
 
-impl One for float {
+impl num::One for float {
     #[inline(always)]
     fn one() -> float { 1.0 }
 }
@@ -869,11 +867,11 @@ mod tests {
         }
         // note: -0 == 0, hence these slightly more complex tests
         match from_str(~"-0") {
-            Some(v) if v.is_zero() => assert!(v.is_negative()),
+            Some(v) if is_zero(v) => assert!(v.is_negative()),
             _ => fail!()
         }
         match from_str(~"0") {
-            Some(v) if v.is_zero() => assert!(v.is_positive()),
+            Some(v) if is_zero(v) => assert!(v.is_positive()),
             _ => fail!()
         }
 
@@ -916,11 +914,11 @@ mod tests {
         }
         // note: -0 == 0, hence these slightly more complex tests
         match from_str_hex(~"-0") {
-            Some(v) if v.is_zero() => assert!(v.is_negative()),
+            Some(v) if is_zero(v) => assert!(v.is_negative()),
             _ => fail!()
         }
         match from_str_hex(~"0") {
-            Some(v) if v.is_zero() => assert!(v.is_positive()),
+            Some(v) if is_zero(v) => assert!(v.is_positive()),
             _ => fail!()
         }
         assert_eq!(from_str_hex(~"e"), Some(14.));

branches/try/src/libcore/num/int-template.rs

@@ -12,7 +12,7 @@ use T = self::inst::T;
 
 use from_str::FromStr;
 use num::{ToStrRadix, FromStrRadix};
-use num::{Zero, One, strconv};
+use num::strconv;
 use prelude::*;
 
 pub use cmp::{min, max};
@@ -152,15 +152,12 @@ impl Eq for T {
     fn ne(&self, other: &T) -> bool { return (*self) != (*other); }
 }
 
-impl Zero for T {
+impl num::Zero for T {
     #[inline(always)]
     fn zero() -> T { 0 }
-
-    #[inline(always)]
-    fn is_zero(&self) -> bool { *self == 0 }
 }
 
-impl One for T {
+impl num::One for T {
     #[inline(always)]
     fn one() -> T { 1 }
 }

branches/try/src/libcore/num/num.rs

@@ -37,12 +37,13 @@ pub trait IntConvertible {
 }
 
 pub trait Zero {
-    fn zero() -> Self;      // FIXME (#5527): This should be an associated constant
-    fn is_zero(&self) -> bool;
+    // FIXME (#5527): These should be associated constants
+    fn zero() -> Self;
 }
 
 pub trait One {
-    fn one() -> Self;       // FIXME (#5527): This should be an associated constant
+    // FIXME (#5527): These should be associated constants
+    fn one() -> Self;
 }
 
 pub trait Signed: Num

branches/try/src/libcore/num/uint-template.rs

@@ -13,7 +13,7 @@ use T_SIGNED = self::inst::T_SIGNED;
 
 use from_str::FromStr;
 use num::{ToStrRadix, FromStrRadix};
-use num::{Zero, One, strconv};
+use num::strconv;
 use prelude::*;
 
 pub use cmp::{min, max};
@@ -118,15 +118,12 @@ impl Eq for T {
     fn ne(&self, other: &T) -> bool { return (*self) != (*other); }
 }
 
-impl Zero for T {
+impl num::Zero for T {
     #[inline(always)]
     fn zero() -> T { 0 }
-
-    #[inline(always)]
-    fn is_zero(&self) -> bool { *self == 0 }
 }
 
-impl One for T {
+impl num::One for T {
     #[inline(always)]
     fn one() -> T { 1 }
 }

branches/try/src/libcore/os.rs

@@ -43,8 +43,6 @@ use vec;
 pub use libc::fclose;
 pub use os::consts::*;
 
-// FIXME: move these to str perhaps? #2620
-
 pub fn close(fd: c_int) -> c_int {
     unsafe {
         libc::close(fd)
@@ -79,6 +77,8 @@ pub fn getcwd() -> Path {
     }
 }
 
+// FIXME: move these to str perhaps? #2620
+
 pub fn as_c_charp<T>(s: &str, f: &fn(*c_char) -> T) -> T {
     str::as_c_str(s, |b| f(b as *c_char))
 }

branches/try/src/libcore/vec.rs

@@ -173,6 +173,7 @@ pub fn from_slice<T:Copy>(t: &[T]) -> ~[T] {
     from_fn(t.len(), |i| t[i])
 }
 
+/// Creates a new vector with a capacity of `capacity`
 pub fn with_capacity<T>(capacity: uint) -> ~[T] {
     let mut vec = ~[];
     reserve(&mut vec, capacity);
@@ -1565,6 +1566,16 @@ pub fn each_permutation<T:Copy>(v: &[T], put: &fn(ts: &[T]) -> bool) {
     }
 }
 
+// see doc below
+#[cfg(stage0)] // XXX: lifetimes!
+pub fn windowed<T>(n: uint, v: &[T], it: &fn(&[T]) -> bool) {
+    assert!(1u <= n);
+    if n > v.len() { return; }
+    for uint::range(0, v.len() - n + 1) |i| {
+        if !it(v.slice(i, i+n)) { return }
+    }
+}
+
 /**
  * Iterate over all contiguous windows of length `n` of the vector `v`.
  *
@@ -1579,14 +1590,6 @@ pub fn each_permutation<T:Copy>(v: &[T], put: &fn(ts: &[T]) -> bool) {
  * ~~~
  *
  */
-#[cfg(stage0)] // XXX: lifetimes!
-pub fn windowed<T>(n: uint, v: &[T], it: &fn(&[T]) -> bool) {
-    assert!(1u <= n);
-    if n > v.len() { return; }
-    for uint::range(0, v.len() - n + 1) |i| {
-        if !it(v.slice(i, i+n)) { return }
-    }
-}
 #[cfg(stage1)]
 #[cfg(stage2)]
 #[cfg(stage3)]

branches/try/src/librustpkg/README.txt

@@ -1,4 +1,24 @@
-Right now (2013-04-11), only one package works, the branch of rust-sdl at:
-https://github.com/catamorphism/rust-sdl/tree/new-rustpkg
+Right now, commands that work are "build" and "clean".
 
-and only one command works, "build".
+`rustpkg build` and `rustpkg clean` should work
+
+for example:
+$ cd ~/rust/src/librustpkg/testsuite/pass
+$ rustpkg build hello-world
+... some output ...
+$ rustpkg clean hello-world
+
+-------------
+the following test packages in librustpkg/testsuite/pass:
+      * hello-world
+      * install-paths
+      * simple-lib
+      * deeply/nested/path
+      * fancy-lib
+
+   It fails on the following test packages:
+      * external-crate (no support for `extern mod` inference yet)
+
+and should fail with proper error messages
+on all of the test packages in librustpkg/testsuite/fail
+      * no-inferred-crates

branches/try/src/librustpkg/conditions.rs

@@ -11,7 +11,12 @@
 // Useful conditions
 
 pub use core::path::Path;
+pub use util::PkgId;
 
 condition! {
     bad_path: (super::Path, ~str) -> super::Path;
 }
+
+condition! {
+    nonexistent_package: (super::PkgId, ~str) -> super::Path;
+}

branches/try/src/librustpkg/context.rs

@@ -0,0 +1,21 @@
+// 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.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Context data structure used by rustpkg
+
+use core::hashmap::HashMap;
+
+pub struct Ctx {
+    // I'm not sure what this is for
+    json: bool,
+    // Cache of hashes of things already installed
+    // though I'm not sure why the value is a bool
+    dep_cache: @mut HashMap<~str, bool>,
+}