Skip to content

Commit 8748322

Browse files
brsonalexcrichton
authored andcommitted
std: Make the generic atomics in sync::atomics private
I'm not comfortable exposing public functions that purport to do atomic operations on arbitrary T.
1 parent eb25c42 commit 8748322

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/libstd/sync/atomics.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ impl<T> Drop for AtomicOption<T> {
692692
}
693693

694694
#[inline]
695-
pub unsafe fn atomic_store<T>(dst: *mut T, val: T, order:Ordering) {
695+
unsafe fn atomic_store<T>(dst: *mut T, val: T, order:Ordering) {
696696
match order {
697697
Release => intrinsics::atomic_store_rel(dst, val),
698698
Relaxed => intrinsics::atomic_store_relaxed(dst, val),
@@ -701,7 +701,7 @@ pub unsafe fn atomic_store<T>(dst: *mut T, val: T, order:Ordering) {
701701
}
702702

703703
#[inline]
704-
pub unsafe fn atomic_load<T>(dst: *mut T, order:Ordering) -> T {
704+
unsafe fn atomic_load<T>(dst: *T, order:Ordering) -> T {
705705
match order {
706706
Acquire => intrinsics::atomic_load_acq(dst),
707707
Relaxed => intrinsics::atomic_load_relaxed(dst),
@@ -710,7 +710,7 @@ pub unsafe fn atomic_load<T>(dst: *mut T, order:Ordering) -> T {
710710
}
711711

712712
#[inline]
713-
pub unsafe fn atomic_swap<T>(dst: *mut T, val: T, order: Ordering) -> T {
713+
unsafe fn atomic_swap<T>(dst: *mut T, val: T, order: Ordering) -> T {
714714
match order {
715715
Acquire => intrinsics::atomic_xchg_acq(dst, val),
716716
Release => intrinsics::atomic_xchg_rel(dst, val),
@@ -722,7 +722,7 @@ pub unsafe fn atomic_swap<T>(dst: *mut T, val: T, order: Ordering) -> T {
722722

723723
/// Returns the old value (like __sync_fetch_and_add).
724724
#[inline]
725-
pub unsafe fn atomic_add<T>(dst: *mut T, val: T, order: Ordering) -> T {
725+
unsafe fn atomic_add<T>(dst: *mut T, val: T, order: Ordering) -> T {
726726
match order {
727727
Acquire => intrinsics::atomic_xadd_acq(dst, val),
728728
Release => intrinsics::atomic_xadd_rel(dst, val),
@@ -734,7 +734,7 @@ pub unsafe fn atomic_add<T>(dst: *mut T, val: T, order: Ordering) -> T {
734734

735735
/// Returns the old value (like __sync_fetch_and_sub).
736736
#[inline]
737-
pub unsafe fn atomic_sub<T>(dst: *mut T, val: T, order: Ordering) -> T {
737+
unsafe fn atomic_sub<T>(dst: *mut T, val: T, order: Ordering) -> T {
738738
match order {
739739
Acquire => intrinsics::atomic_xsub_acq(dst, val),
740740
Release => intrinsics::atomic_xsub_rel(dst, val),
@@ -745,7 +745,7 @@ pub unsafe fn atomic_sub<T>(dst: *mut T, val: T, order: Ordering) -> T {
745745
}
746746

747747
#[inline]
748-
pub unsafe fn atomic_compare_and_swap<T>(dst: *mut T, old:T, new:T, order: Ordering) -> T {
748+
unsafe fn atomic_compare_and_swap<T>(dst: *mut T, old:T, new:T, order: Ordering) -> T {
749749
match order {
750750
Acquire => intrinsics::atomic_cxchg_acq(dst, old, new),
751751
Release => intrinsics::atomic_cxchg_rel(dst, old, new),
@@ -756,7 +756,7 @@ pub unsafe fn atomic_compare_and_swap<T>(dst: *mut T, old:T, new:T, order: Order
756756
}
757757

758758
#[inline]
759-
pub unsafe fn atomic_and<T>(dst: *mut T, val: T, order: Ordering) -> T {
759+
unsafe fn atomic_and<T>(dst: *mut T, val: T, order: Ordering) -> T {
760760
match order {
761761
Acquire => intrinsics::atomic_and_acq(dst, val),
762762
Release => intrinsics::atomic_and_rel(dst, val),
@@ -767,7 +767,7 @@ pub unsafe fn atomic_and<T>(dst: *mut T, val: T, order: Ordering) -> T {
767767
}
768768

769769
#[inline]
770-
pub unsafe fn atomic_nand<T>(dst: &T, val: T, order: Ordering) -> T {
770+
unsafe fn atomic_nand<T>(dst: *mut T, val: T, order: Ordering) -> T {
771771
match order {
772772
Acquire => intrinsics::atomic_nand_acq(dst, val),
773773
Release => intrinsics::atomic_nand_rel(dst, val),
@@ -779,7 +779,7 @@ pub unsafe fn atomic_nand<T>(dst: &T, val: T, order: Ordering) -> T {
779779

780780

781781
#[inline]
782-
pub unsafe fn atomic_or<T>(dst: *mut T, val: T, order: Ordering) -> T {
782+
unsafe fn atomic_or<T>(dst: *mut T, val: T, order: Ordering) -> T {
783783
match order {
784784
Acquire => intrinsics::atomic_or_acq(dst, val),
785785
Release => intrinsics::atomic_or_rel(dst, val),
@@ -791,7 +791,7 @@ pub unsafe fn atomic_or<T>(dst: *mut T, val: T, order: Ordering) -> T {
791791

792792

793793
#[inline]
794-
pub unsafe fn atomic_xor<T>(dst: *mut T, val: T, order: Ordering) -> T {
794+
unsafe fn atomic_xor<T>(dst: *mut T, val: T, order: Ordering) -> T {
795795
match order {
796796
Acquire => intrinsics::atomic_xor_acq(dst, val),
797797
Release => intrinsics::atomic_xor_rel(dst, val),

0 commit comments

Comments
 (0)