Skip to content

Commit 9d5ebd3

Browse files
committed
---
yaml --- r: 140752 b: refs/heads/try2 c: 852af34 h: refs/heads/master v: v3
1 parent 3094429 commit 9d5ebd3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: fa1a172f9c8b5071a7bc9d818bfa6ae26401ec5b
8+
refs/heads/try2: 852af346d346e0119af8336c88ee1b113346ac7c
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/unstable/intrinsics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ pub extern "rust-intrinsic" {
1919
pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
2020
pub fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
2121
pub fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
22-
22+
2323
#[cfg(not(stage0))]
2424
pub fn atomic_load(src: &int) -> int;
2525
#[cfg(not(stage0))]
2626
pub fn atomic_load_acq(src: &int) -> int;
27-
27+
2828
#[cfg(not(stage0))]
2929
pub fn atomic_store(dst: &mut int, val: int);
3030
#[cfg(not(stage0))]

branches/try2/src/librustc/lib/llvm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,7 @@ pub mod llvm {
15741574
Ptr: ValueRef,
15751575
Order: AtomicOrdering)
15761576
-> ValueRef;
1577-
1577+
15781578
pub unsafe fn LLVMBuildAtomicCmpXchg(B: BuilderRef,
15791579
LHS: ValueRef,
15801580
CMP: ValueRef,

0 commit comments

Comments
 (0)