Skip to content

Commit 8e3f364

Browse files
committed
---
yaml --- r: 64661 b: refs/heads/snap-stage3 c: 1354cfa h: refs/heads/master i: 64659: bb1b837 v: v3
1 parent 284bb8d commit 8e3f364

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: bbedbc04507ea3a1e87905c4b37c3460b5de1746
4+
refs/heads/snap-stage3: 1354cfa07f0f236708d31a743e9f5bbb3ab6872f
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/future.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ mod test {
194194
195195
#[test]
196196
fn test_interface_unwrap() {
197-
let mut f = from_value(~"fail");
197+
let f = from_value(~"fail");
198198
assert_eq!(f.unwrap(), ~"fail");
199199
}
200200

branches/snap-stage3/src/test/run-pass/resource-cycle.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,14 @@ impl Drop for r {
2323
cast::transmute::<*r, uint>(self),
2424
cast::transmute::<**int, uint>(&(self.v)),
2525
cast::transmute::<*int, uint>(self.v));
26-
let v2: ~int = cast::transmute(self.v);
26+
let _v2: ~int = cast::transmute(self.v);
2727
}
2828
}
2929
}
3030

3131
fn r(v: *int) -> r {
32-
unsafe {
33-
r {
34-
v: v
35-
}
32+
r {
33+
v: v
3634
}
3735
}
3836

@@ -52,7 +50,7 @@ pub fn main() {
5250
let i2p = cast::transmute_copy(&i2);
5351
cast::forget(i2);
5452

55-
let mut x1 = @mut t(Node{
53+
let x1 = @mut t(Node{
5654
next: None,
5755
r: {
5856
let rs = r(i1p);
@@ -64,7 +62,7 @@ pub fn main() {
6462
cast::transmute::<@mut t, uint>(x1),
6563
cast::transmute::<*r, uint>(&x1.r));
6664

67-
let mut x2 = @mut t(Node{
65+
let x2 = @mut t(Node{
6866
next: None,
6967
r: {
7068
let rs = r(i2p);

0 commit comments

Comments
 (0)