---

thestinger · thestinger · commit f0a533666d0f · 2013-01-22T21:28:28.000-05:00
yaml --- r: 52435 b: refs/heads/dist-snap c: 8cff5c2 h: refs/heads/master i: 52433: 51b2e33 52431: fb1dc18 v: v3
diff --git a/[refs] b/[refs]
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 7de5e6c487c2b3b803c619f8c19ffa8742535e49
+refs/heads/dist-snap: 8cff5c22c3d4354a2058b7c3e7ddd6d263bf8190
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/libcore/task/spawn.rs b/branches/dist-snap/src/libcore/task/spawn.rs
@@ -96,21 +96,21 @@ macro_rules! move_it (
     { $x:expr } => ( unsafe { let y = move *ptr::addr_of(&($x)); move y } )
 )
 
-type TaskSet = send_map::linear::LinearMap<*rust_task,()>;
+type TaskSet = send_map::linear::LinearSet<*rust_task>;
 
 fn new_taskset() -> TaskSet {
-    send_map::linear::LinearMap()
+    send_map::linear::LinearSet::new()
 }
 fn taskset_insert(tasks: &mut TaskSet, task: *rust_task) {
-    let didnt_overwrite = tasks.insert(task, ());
+    let didnt_overwrite = tasks.insert(task);
     assert didnt_overwrite;
 }
 fn taskset_remove(tasks: &mut TaskSet, task: *rust_task) {
     let was_present = tasks.remove(&task);
     assert was_present;
 }
 pub fn taskset_each(tasks: &TaskSet, blk: fn(v: *rust_task) -> bool) {
-    tasks.each_key(|k| blk(*k))
+    tasks.each(|k| blk(*k))
 }
 
 // One of these per group of linked-failure tasks.

Original file line number	Diff line number	Diff line change
`@@ -96,21 +96,21 @@ macro_rules! move_it (`
`96`	`96`	`{ $x:expr } => ( unsafe { let y = move *ptr::addr_of(&($x)); move y } )`
`97`	`97`	`)`
`98`	`98`
`99`		`-type TaskSet = send_map::linear::LinearMap<*rust_task,()>;`
	`99`	`+type TaskSet = send_map::linear::LinearSet<*rust_task>;`
`100`	`100`
`101`	`101`	`fn new_taskset() -> TaskSet {`
`102`		`- send_map::linear::LinearMap()`
	`102`	`+ send_map::linear::LinearSet::new()`
`103`	`103`	`}`
`104`	`104`	`fn taskset_insert(tasks: &mut TaskSet, task: *rust_task) {`
`105`		`- let didnt_overwrite = tasks.insert(task, ());`
	`105`	`+ let didnt_overwrite = tasks.insert(task);`
`106`	`106`	`assert didnt_overwrite;`
`107`	`107`	`}`
`108`	`108`	`fn taskset_remove(tasks: &mut TaskSet, task: *rust_task) {`
`109`	`109`	`let was_present = tasks.remove(&task);`
`110`	`110`	`assert was_present;`
`111`	`111`	`}`
`112`	`112`	`pub fn taskset_each(tasks: &TaskSet, blk: fn(v: *rust_task) -> bool) {`
`113`		`- tasks.each_key(\|k\| blk(*k))`
	`113`	`+ tasks.each(\|k\| blk(*k))`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`// One of these per group of linked-failure tasks.`