---

brson · brson · commit 5408a7c49232 · 2012-12-14T14:58:16.000-08:00
yaml --- r: 39382 b: refs/heads/incoming c: c35a858 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: ebc19034ee9b23ede446d7261ffac0da7b8588d9
+refs/heads/incoming: c35a8589ab66ee42965709f403b3032f757a79a8
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/test/run-pass/hashmap-memory.rs b/branches/incoming/src/test/run-pass/hashmap-memory.rs
@@ -41,8 +41,8 @@ mod map_reduce {
 
     fn start_mappers(ctrl: Chan<ctrl_proto>, inputs: ~[~str]) {
         for inputs.each |i| {
-            let i = *i;
-            task::spawn(|move i| map_task(ctrl, i) );
+            let i = copy *i;
+            task::spawn(|move i| map_task(ctrl, copy i) );
         }
     }
 
diff --git a/branches/incoming/src/test/run-pass/issue-2804.rs b/branches/incoming/src/test/run-pass/issue-2804.rs
@@ -67,7 +67,7 @@ fn add_interfaces(store: int, managed_ip: ~str, device: std::map::HashMap<~str,
         std::json::List(interfaces) =>
         {
           do vec::map(interfaces) |interface| {
-                add_interface(store, managed_ip, *interface)
+                add_interface(store, copy managed_ip, copy *interface)
           }
         }
         _ =>

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ mod map_reduce {`
`41`	`41`
`42`	`42`	`fn start_mappers(ctrl: Chan<ctrl_proto>, inputs: ~[~str]) {`
`43`	`43`	`for inputs.each \|i\| {`
`44`		`- let i = *i;`
`45`		`- task::spawn(\|move i\| map_task(ctrl, i) );`
	`44`	`+ let i = copy *i;`
	`45`	`+ task::spawn(\|move i\| map_task(ctrl, copy i) );`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ fn add_interfaces(store: int, managed_ip: ~str, device: std::map::HashMap<~str,`
`67`	`67`	`std::json::List(interfaces) =>`
`68`	`68`	`{`
`69`	`69`	`do vec::map(interfaces) \|interface\| {`
`70`		`- add_interface(store, managed_ip, *interface)`
	`70`	`+ add_interface(store, copy managed_ip, copy *interface)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`_ =>`