---

yaml
---
r: 64895
b: refs/heads/snap-stage3
c: 11fc1fd
h: refs/heads/master
i:
  64893: 1e3e5fa
  64891: 8466d89
  64887: 0c4f003
  64879: b0ab78a
  64863: 1670e3c
  64831: 6f2e4d6
  64767: 6b3415b
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 91f1ab48969e1b7d3f4871348db2ec302000c93a
+refs/heads/snap-stage3: 11fc1fd48556ff123487cdf16bfb3ab478084970
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/arc.rs

@@ -136,7 +136,7 @@ impl<T:Freeze+Send> Arc<T> {
      */
     pub fn unwrap(self) -> T {
         let Arc { x: x } = self;
-        x.unwrap()
+        unsafe { x.unwrap() }
     }
 }
 
@@ -250,7 +250,7 @@ impl<T:Send> MutexArc<T> {
      */
     pub fn unwrap(self) -> T {
         let MutexArc { x: x } = self;
-        let inner = x.unwrap();
+        let inner = unsafe { x.unwrap() };
         let MutexArcInner { failed: failed, data: data, _ } = inner;
         if failed {
             fail!(~"Can't unwrap poisoned MutexArc - another task failed inside!");
@@ -469,7 +469,7 @@ impl<T:Freeze + Send> RWArc<T> {
      */
     pub fn unwrap(self) -> T {
         let RWArc { x: x, _ } = self;
-        let inner = x.unwrap();
+        let inner = unsafe { x.unwrap() };
         let RWArcInner { failed: failed, data: data, _ } = inner;
         if failed {
             fail!(~"Can't unwrap poisoned RWArc - another task failed inside!")

branches/snap-stage3/src/libextra/sync.rs

@@ -130,9 +130,11 @@ impl<Q:Send> Sem<Q> {
 impl Sem<()> {
     pub fn access<U>(&self, blk: &fn() -> U) -> U {
         let mut release = None;
-        do task::unkillable {
-            self.acquire();
-            release = Some(SemRelease(self));
+        unsafe {
+            do task::unkillable {
+                self.acquire();
+                release = Some(SemRelease(self));
+            }
         }
         blk()
     }
@@ -151,9 +153,11 @@ impl Sem<~[WaitQueue]> {
 
     pub fn access_waitqueue<U>(&self, blk: &fn() -> U) -> U {
         let mut release = None;
-        do task::unkillable {
-            self.acquire();
-            release = Some(SemAndSignalRelease(self));
+        unsafe {
+            do task::unkillable {
+                self.acquire();
+                release = Some(SemAndSignalRelease(self));
+            }
         }
         blk()
     }
@@ -290,15 +294,17 @@ impl<'self> Condvar<'self> {
         #[unsafe_destructor]
         impl<'self> Drop for CondvarReacquire<'self> {
             fn drop(&self) {
-                // Needs to succeed, instead of itself dying.
-                do task::unkillable {
-                    match self.order {
-                        Just(lock) => do lock.access {
-                            self.sem.acquire();
-                        },
-                        Nothing => {
-                            self.sem.acquire();
-                        },
+                unsafe {
+                    // Needs to succeed, instead of itself dying.
+                    do task::unkillable {
+                        match self.order {
+                            Just(lock) => do lock.access {
+                                self.sem.acquire();
+                            },
+                            Nothing => {
+                                self.sem.acquire();
+                            },
+                        }
                     }
                 }
             }
@@ -638,12 +644,14 @@ impl RWLock {
         // Implementation slightly different from the slicker 'write's above.
         // The exit path is conditional on whether the caller downgrades.
         let mut _release = None;
-        do task::unkillable {
-            (&self.order_lock).acquire();
-            (&self.access_lock).acquire();
-            (&self.order_lock).release();
+        unsafe {
+            do task::unkillable {
+                (&self.order_lock).acquire();
+                (&self.access_lock).acquire();
+                (&self.order_lock).release();
+            }
+            _release = Some(RWLockReleaseDowngrade(self));
         }
-        _release = Some(RWLockReleaseDowngrade(self));
         blk(RWLockWriteMode { lock: self })
     }
 

branches/snap-stage3/src/libstd/num/num.rs

@@ -8,10 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Numeric traits and functions for generic mathematics.
-//!
-//! These are implemented for the primitive numeric types in `std::{u8, u16,
-//! u32, u64, uint, i8, i16, i32, i64, int, f32, f64, float}`.
+//! An interface for numeric types
 
 #[allow(missing_doc)];
 
@@ -22,7 +19,9 @@ use option::Option;
 
 pub mod strconv;
 
+///
 /// The base trait for numeric types
+///
 pub trait Num: Eq + Zero + One
              + Neg<Self>
              + Add<Self,Self>
@@ -46,23 +45,18 @@ pub trait Orderable: Ord {
     fn clamp(&self, mn: &Self, mx: &Self) -> Self;
 }
 
-#[inline(always)] pub fn min<T: Orderable>(x: T, y: T) -> T { x.min(&y) }
-#[inline(always)] pub fn max<T: Orderable>(x: T, y: T) -> T { x.max(&y) }
-#[inline(always)] pub fn clamp<T: Orderable>(value: T, mn: T, mx: T) -> T { value.clamp(&mn, &mx) }
+#[inline(always)] pub fn min<T: Orderable>(a: T, b: T) -> T { a.min(&b) }
+#[inline(always)] pub fn max<T: Orderable>(a: T, b: T) -> T { a.max(&b) }
 
 pub trait Zero {
     fn zero() -> Self;      // FIXME (#5527): This should be an associated constant
     fn is_zero(&self) -> bool;
 }
 
-#[inline(always)] pub fn zero<T: Zero>() -> T { Zero::zero() }
-
 pub trait One {
     fn one() -> Self;       // FIXME (#5527): This should be an associated constant
 }
 
-#[inline(always)] pub fn one<T: One>() -> T { One::one() }
-
 pub trait Signed: Num
                 + Neg<Self> {
     fn abs(&self) -> Self;
@@ -74,7 +68,6 @@ pub trait Signed: Num
 }
 
 #[inline(always)] pub fn abs<T: Signed>(value: T) -> T { value.abs() }
-#[inline(always)] pub fn abs_sub<T: Signed>(x: T, y: T) -> T { x.abs_sub(&y) }
 #[inline(always)] pub fn signum<T: Signed>(value: T) -> T { value.signum() }
 
 pub trait Unsigned: Num {}
@@ -97,9 +90,6 @@ pub trait Integer: Num
     fn is_odd(&self) -> bool;
 }
 
-#[inline(always)] pub fn gcd<T: Integer>(x: T, y: T) -> T { x.gcd(&y) }
-#[inline(always)] pub fn lcm<T: Integer>(x: T, y: T) -> T { x.lcm(&y) }
-
 pub trait Round {
     fn floor(&self) -> Self;
     fn ceil(&self) -> Self;
@@ -123,21 +113,15 @@ pub trait Algebraic {
     fn hypot(&self, other: &Self) -> Self;
 }
 
-#[inline(always)] pub fn pow<T: Algebraic>(value: T, n: T) -> T { value.pow(&n) }
 #[inline(always)] pub fn sqrt<T: Algebraic>(value: T) -> T { value.sqrt() }
-#[inline(always)] pub fn rsqrt<T: Algebraic>(value: T) -> T { value.rsqrt() }
-#[inline(always)] pub fn cbrt<T: Algebraic>(value: T) -> T { value.cbrt() }
-#[inline(always)] pub fn hypot<T: Algebraic>(x: T, y: T) -> T { x.hypot(&y) }
 
 pub trait Trigonometric {
     fn sin(&self) -> Self;
     fn cos(&self) -> Self;
     fn tan(&self) -> Self;
-
     fn asin(&self) -> Self;
     fn acos(&self) -> Self;
     fn atan(&self) -> Self;
-
     fn atan2(&self, other: &Self) -> Self;
     fn sin_cos(&self) -> (Self, Self);
 }
@@ -151,12 +135,10 @@ pub trait Trigonometric {
 #[inline(always)] pub fn atan<T: Trigonometric>(value: T) -> T { value.atan() }
 
 #[inline(always)] pub fn atan2<T: Trigonometric>(x: T, y: T) -> T { x.atan2(&y) }
-#[inline(always)] pub fn sin_cos<T: Trigonometric>(value: T) -> (T, T) { value.sin_cos() }
 
 pub trait Exponential {
     fn exp(&self) -> Self;
     fn exp2(&self) -> Self;
-
     fn ln(&self) -> Self;
     fn log(&self, base: &Self) -> Self;
     fn log2(&self) -> Self;
@@ -175,7 +157,6 @@ pub trait Hyperbolic: Exponential {
     fn sinh(&self) -> Self;
     fn cosh(&self) -> Self;
     fn tanh(&self) -> Self;
-
     fn asinh(&self) -> Self;
     fn acosh(&self) -> Self;
     fn atanh(&self) -> Self;
@@ -189,7 +170,9 @@ pub trait Hyperbolic: Exponential {
 #[inline(always)] pub fn acosh<T: Hyperbolic>(value: T) -> T { value.acosh() }
 #[inline(always)] pub fn atanh<T: Hyperbolic>(value: T) -> T { value.atanh() }
 
+///
 /// Defines constants and methods common to real numbers
+///
 pub trait Real: Signed
               + Fractional
               + Algebraic
@@ -220,7 +203,9 @@ pub trait Real: Signed
     fn to_radians(&self) -> Self;
 }
 
+///
 /// Methods that are harder to implement and not commonly used.
+///
 pub trait RealExt: Real {
     // FIXME (#5527): usages of `int` should be replaced with an associated
     // integer type once these are implemented
@@ -238,7 +223,9 @@ pub trait RealExt: Real {
     fn yn(&self, n: int) -> Self;
 }
 
+///
 /// Collects the bitwise operators under one trait.
+///
 pub trait Bitwise: Not<Self>
                  + BitAnd<Self,Self>
                  + BitOr<Self,Self>
@@ -258,9 +245,11 @@ pub trait Bounded {
     fn max_value() -> Self;
 }
 
+///
 /// Specifies the available operations common to all of Rust's core numeric primitives.
 /// These may not always make sense from a purely mathematical point of view, but
 /// may be useful for systems programming.
+///
 pub trait Primitive: Num
                    + NumCast
                    + Bounded
@@ -275,13 +264,17 @@ pub trait Primitive: Num
     fn bytes() -> uint;
 }
 
+///
 /// A collection of traits relevant to primitive signed and unsigned integers
+///
 pub trait Int: Integer
              + Primitive
              + Bitwise
              + BitCount {}
 
+///
 /// Used for representing the classification of floating point numbers
+///
 #[deriving(Eq)]
 pub enum FPCategory {
     /// "Not a Number", often obtained by dividing by zero
@@ -296,7 +289,9 @@ pub enum FPCategory {
     FPNormal,
 }
 
+///
 /// Primitive floating point numbers
+///
 pub trait Float: Real
                + Signed
                + Primitive
@@ -330,10 +325,7 @@ pub trait Float: Real
     fn next_after(&self, other: Self) -> Self;
 }
 
-#[inline(always)] pub fn exp_m1<T: Float>(value: T) -> T { value.exp_m1() }
-#[inline(always)] pub fn ln_1p<T: Float>(value: T) -> T { value.ln_1p() }
-#[inline(always)] pub fn mul_add<T: Float>(a: T, b: T, c: T) -> T { a.mul_add(b, c) }
-
+///
 /// Cast from one machine scalar to another
 ///
 /// # Example
@@ -348,7 +340,9 @@ pub fn cast<T:NumCast,U:NumCast>(n: T) -> U {
     NumCast::from(n)
 }
 
+///
 /// An interface for casting between machine scalars
+///
 pub trait NumCast {
     fn from<T:NumCast>(n: T) -> Self;
 
@@ -420,6 +414,7 @@ pub trait FromStrRadix {
     pub fn from_str_radix(str: &str, radix: uint) -> Option<Self>;
 }
 
+///
 /// Calculates a power to a given radix, optimized for uint `pow` and `radix`.
 ///
 /// Returns `radix^pow` as `T`.