---

alexcrichton · alexcrichton · commit 2b88eb026218 · 2015-01-07T20:08:37.000-08:00
yaml --- r: 172207 b: refs/heads/beta c: 0abf458 h: refs/heads/master i: 172205: df677df 172203: ca3fec8 172199: 8d7d82f 172191: cb80889 v: v3
diff --git a/[refs] b/[refs]
@@ -31,5 +31,5 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b5571ed71a5879c0495a982506258d5d267744ed
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: ef46caebcc2466c54d691dbc801e0b4a431f3ff3
+refs/heads/beta: 0abf4583486071a958aa1bd14ab8c5b8870fb74d
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
diff --git a/branches/beta/src/libstd/sys/windows/timer.rs b/branches/beta/src/libstd/sys/windows/timer.rs
@@ -91,7 +91,7 @@ fn helper(input: libc::HANDLE, messages: Receiver<Req>, _: ()) {
         } else {
             let remove = {
                 match &mut chans[idx as uint - 1] {
-                    &(ref mut c, oneshot) => { c.call(); oneshot }
+                    &mut (ref mut c, oneshot) => { c.call(); oneshot }
                 }
             };
             if remove {
diff --git a/branches/beta/src/test/pretty/path-type-bounds.rs b/branches/beta/src/test/pretty/path-type-bounds.rs
@@ -19,6 +19,6 @@ fn foo<'a>(x: Box<Tr+ Sync + 'a>) -> Box<Tr+ Sync + 'a> { x }
 fn main() {
     let x: Box<Tr+ Sync>;
 
-    box() 1i as Box<Tr+ Sync>;
+    Box::new(1i) as Box<Tr+ Sync>;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ fn helper(input: libc::HANDLE, messages: Receiver<Req>, _: ()) {`
`91`	`91`	`} else {`
`92`	`92`	`let remove = {`
`93`	`93`	`match &mut chans[idx as uint - 1] {`
`94`		`- &(ref mut c, oneshot) => { c.call(); oneshot }`
	`94`	`+ &mut (ref mut c, oneshot) => { c.call(); oneshot }`
`95`	`95`	`}`
`96`	`96`	`};`
`97`	`97`	`if remove {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ fn foo<'a>(x: Box<Tr+ Sync + 'a>) -> Box<Tr+ Sync + 'a> { x }`
`19`	`19`	`fn main() {`
`20`	`20`	`let x: Box<Tr+ Sync>;`
`21`	`21`
`22`		`- box() 1i as Box<Tr+ Sync>;`
	`22`	`+ Box::new(1i) as Box<Tr+ Sync>;`
`23`	`23`	`}`
`24`	`24`