Skip to content

Commit 875bacf

Browse files
committed
---
yaml --- r: 235111 b: refs/heads/stable c: 409fc2f h: refs/heads/master i: 235109: 54d13d3 235107: 8f88cd5 235103: 9154f88 v: v3
1 parent 2a4f2e1 commit 875bacf

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 320bd6f8744159739965f896275eceadbe24f370
32+
refs/heads/stable: 409fc2f605a27f9f0b8bfdfe453b76b3edecba61
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/libcore/atomic.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,6 @@ unsafe fn atomic_store<T>(dst: *mut T, val: T, order:Ordering) {
953953
}
954954

955955
#[inline]
956-
#[stable(feature = "rust1", since = "1.0.0")]
957956
unsafe fn atomic_load<T>(dst: *const T, order:Ordering) -> T {
958957
match order {
959958
Acquire => intrinsics::atomic_load_acq(dst),
@@ -965,7 +964,6 @@ unsafe fn atomic_load<T>(dst: *const T, order:Ordering) -> T {
965964
}
966965

967966
#[inline]
968-
#[stable(feature = "rust1", since = "1.0.0")]
969967
unsafe fn atomic_swap<T>(dst: *mut T, val: T, order: Ordering) -> T {
970968
match order {
971969
Acquire => intrinsics::atomic_xchg_acq(dst, val),
@@ -978,7 +976,6 @@ unsafe fn atomic_swap<T>(dst: *mut T, val: T, order: Ordering) -> T {
978976

979977
/// Returns the old value (like __sync_fetch_and_add).
980978
#[inline]
981-
#[stable(feature = "rust1", since = "1.0.0")]
982979
unsafe fn atomic_add<T>(dst: *mut T, val: T, order: Ordering) -> T {
983980
match order {
984981
Acquire => intrinsics::atomic_xadd_acq(dst, val),
@@ -991,7 +988,6 @@ unsafe fn atomic_add<T>(dst: *mut T, val: T, order: Ordering) -> T {
991988

992989
/// Returns the old value (like __sync_fetch_and_sub).
993990
#[inline]
994-
#[stable(feature = "rust1", since = "1.0.0")]
995991
unsafe fn atomic_sub<T>(dst: *mut T, val: T, order: Ordering) -> T {
996992
match order {
997993
Acquire => intrinsics::atomic_xsub_acq(dst, val),
@@ -1003,7 +999,6 @@ unsafe fn atomic_sub<T>(dst: *mut T, val: T, order: Ordering) -> T {
1003999
}
10041000

10051001
#[inline]
1006-
#[stable(feature = "rust1", since = "1.0.0")]
10071002
unsafe fn atomic_compare_and_swap<T>(dst: *mut T, old:T, new:T, order: Ordering) -> T {
10081003
match order {
10091004
Acquire => intrinsics::atomic_cxchg_acq(dst, old, new),
@@ -1015,7 +1010,6 @@ unsafe fn atomic_compare_and_swap<T>(dst: *mut T, old:T, new:T, order: Ordering)
10151010
}
10161011

10171012
#[inline]
1018-
#[stable(feature = "rust1", since = "1.0.0")]
10191013
unsafe fn atomic_and<T>(dst: *mut T, val: T, order: Ordering) -> T {
10201014
match order {
10211015
Acquire => intrinsics::atomic_and_acq(dst, val),
@@ -1027,7 +1021,6 @@ unsafe fn atomic_and<T>(dst: *mut T, val: T, order: Ordering) -> T {
10271021
}
10281022

10291023
#[inline]
1030-
#[stable(feature = "rust1", since = "1.0.0")]
10311024
unsafe fn atomic_nand<T>(dst: *mut T, val: T, order: Ordering) -> T {
10321025
match order {
10331026
Acquire => intrinsics::atomic_nand_acq(dst, val),
@@ -1040,7 +1033,6 @@ unsafe fn atomic_nand<T>(dst: *mut T, val: T, order: Ordering) -> T {
10401033

10411034

10421035
#[inline]
1043-
#[stable(feature = "rust1", since = "1.0.0")]
10441036
unsafe fn atomic_or<T>(dst: *mut T, val: T, order: Ordering) -> T {
10451037
match order {
10461038
Acquire => intrinsics::atomic_or_acq(dst, val),
@@ -1053,7 +1045,6 @@ unsafe fn atomic_or<T>(dst: *mut T, val: T, order: Ordering) -> T {
10531045

10541046

10551047
#[inline]
1056-
#[stable(feature = "rust1", since = "1.0.0")]
10571048
unsafe fn atomic_xor<T>(dst: *mut T, val: T, order: Ordering) -> T {
10581049
match order {
10591050
Acquire => intrinsics::atomic_xor_acq(dst, val),

0 commit comments

Comments
 (0)