---

yaml
---
r: 67508
b: refs/heads/master
c: 8ec70ae
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b57ffef37e6e2196ad948ab2f6944d242c3aaaf1
+refs/heads/master: 8ec70ae5de0e33ab62732c59b0b2b0620cb8dce9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libstd/unstable/atomics.rs

@@ -205,18 +205,6 @@ impl AtomicInt {
     pub fn fetch_sub(&mut self, val: int, order: Ordering) -> int {
         unsafe { atomic_sub(&mut self.v, val, order) }
     }
-
-    /// Returns the old value
-    #[inline]
-    pub fn fetch_min(&mut self, val: int, order: Ordering) -> int {
-        unsafe { atomic_min(&mut self.v, val, order) }
-    }
-
-    /// Returns the old value
-    #[inline]
-    pub fn fetch_max(&mut self, val: int, order: Ordering) -> int {
-        unsafe { atomic_max(&mut self.v, val, order) }
-    }
 }
 
 impl AtomicUint {
@@ -255,18 +243,6 @@ impl AtomicUint {
     pub fn fetch_sub(&mut self, val: uint, order: Ordering) -> uint {
         unsafe { atomic_sub(&mut self.v, val, order) }
     }
-
-    /// Returns the old value
-    #[inline]
-    pub fn fetch_min(&mut self, val: uint, order: Ordering) -> uint {
-        unsafe { atomic_umin(&mut self.v, val, order) }
-    }
-
-    /// Returns the old value
-    #[inline]
-    pub fn fetch_max(&mut self, val: uint, order: Ordering) -> uint {
-        unsafe { atomic_umax(&mut self.v, val, order) }
-    }
 }
 
 impl<T> AtomicPtr<T> {
@@ -515,64 +491,6 @@ pub unsafe fn atomic_xor<T>(dst: &mut T, val: T, order: Ordering) -> T {
 }
 
 
-#[inline]
-pub unsafe fn atomic_max<T>(dst: &mut T, val: T, order: Ordering) -> T {
-    let dst = cast::transmute(dst);
-    let val = cast::transmute(val);
-
-    cast::transmute(match order {
-        Acquire => intrinsics::atomic_max_acq(dst, val),
-        Release => intrinsics::atomic_max_rel(dst, val),
-        AcqRel  => intrinsics::atomic_max_acqrel(dst, val),
-        Relaxed => intrinsics::atomic_max_relaxed(dst, val),
-        _       => intrinsics::atomic_max(dst, val)
-    })
-}
-
-
-#[inline]
-pub unsafe fn atomic_min<T>(dst: &mut T, val: T, order: Ordering) -> T {
-    let dst = cast::transmute(dst);
-    let val = cast::transmute(val);
-
-    cast::transmute(match order {
-        Acquire => intrinsics::atomic_min_acq(dst, val),
-        Release => intrinsics::atomic_min_rel(dst, val),
-        AcqRel  => intrinsics::atomic_min_acqrel(dst, val),
-        Relaxed => intrinsics::atomic_min_relaxed(dst, val),
-        _       => intrinsics::atomic_min(dst, val)
-    })
-}
-
-#[inline]
-pub unsafe fn atomic_umax<T>(dst: &mut T, val: T, order: Ordering) -> T {
-    let dst = cast::transmute(dst);
-    let val = cast::transmute(val);
-
-    cast::transmute(match order {
-        Acquire => intrinsics::atomic_umax_acq(dst, val),
-        Release => intrinsics::atomic_umax_rel(dst, val),
-        AcqRel  => intrinsics::atomic_umax_acqrel(dst, val),
-        Relaxed => intrinsics::atomic_umax_relaxed(dst, val),
-        _       => intrinsics::atomic_umax(dst, val)
-    })
-}
-
-
-#[inline]
-pub unsafe fn atomic_umin<T>(dst: &mut T, val: T, order: Ordering) -> T {
-    let dst = cast::transmute(dst);
-    let val = cast::transmute(val);
-
-    cast::transmute(match order {
-        Acquire => intrinsics::atomic_umin_acq(dst, val),
-        Release => intrinsics::atomic_umin_rel(dst, val),
-        AcqRel  => intrinsics::atomic_umin_acqrel(dst, val),
-        Relaxed => intrinsics::atomic_umin_relaxed(dst, val),
-        _       => intrinsics::atomic_umin(dst, val)
-    })
-}
-
 /**
  * An atomic fence.
  *

trunk/src/libsyntax/ext/expand.rs

@@ -683,7 +683,7 @@ pub fn std_macros() -> @str {
         ($cond:expr) => {
             if !$cond {
                 ::std::sys::FailWithCause::fail_with(
-                    ~\"assertion failed: \" + stringify!($cond), file!(), line!())
+                    \"assertion failed: \" + stringify!($cond), file!(), line!())
             }
         };
         ($cond:expr, $msg:expr) => {

trunk/src/snapshots.txt

@@ -1,3 +1,11 @@
+S 2013-07-31 389aba0
+  freebsd-x86_64 c9783bb5723404be8ae371d265bbb9a1c679e4db
+  linux-i386 7413d98325b23dc461ced92757e5e19bec750dbd
+  linux-x86_64 cd3fedbb02423f330aedaae6173914659ccb98e5
+  macos-i386 fef296e534b5e12d382708e658370957d5df9a0e
+  macos-x86_64 57bd3da763607386a08b2a50ecf5a7778aea8356
+  winnt-i386 a532aaabf043370a21458fd6874be41d432b5696
+
 S 2013-07-25 4cf3072
   macos-i386 f682d6e9ca0d56768bd36a0c05b7e58e12694dff
   macos-x86_64 2f4e85c9756ba31a04fa8dd1c999fbaf8e1d3d1a