Skip to content

Commit 72080f9

Browse files
committed
---
yaml --- r: 152349 b: refs/heads/try2 c: d743b88 h: refs/heads/master i: 152347: ac7604c v: v3
1 parent 6c07265 commit 72080f9

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
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: 550c347d7b9fbeb10dcf039f0e7e0c16de83dc4a
8+
refs/heads/try2: d743b8831e6dc5b390af112cc23159d667cf583b
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/run-pass/match-ref-binding-in-guard-3256.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::unstable;
11+
use std::rt;
1212

1313
pub fn main() {
1414
unsafe {
15-
let x = Some(unstable::sync::Exclusive::new(true));
15+
let x = Some(rt::exclusive::Exclusive::new(true));
1616
match x {
17-
Some(ref z) if z.with(|b| *b) => {
18-
z.with(|b| assert!(*b));
17+
Some(ref z) if *z.lock() => {
18+
assert!(*z.lock());
1919
},
2020
_ => fail!()
2121
}

branches/try2/src/test/run-pass/writealias.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
// except according to those terms.
1010

1111

12-
use std::unstable;
12+
use std::rt;
1313

1414
struct Point {x: int, y: int, z: int}
1515

1616
fn f(p: &mut Point) { p.z = 13; }
1717

1818
pub fn main() {
1919
unsafe {
20-
let x = Some(unstable::sync::Exclusive::new(true));
20+
let x = Some(rt::exclusive::Exclusive::new(true));
2121
match x {
22-
Some(ref z) if z.with(|b| *b) => {
23-
z.with(|b| assert!(*b));
22+
Some(ref z) if *z.lock() => {
23+
assert!(*z.lock());
2424
},
2525
_ => fail!()
2626
}

0 commit comments

Comments
 (0)