---

eholk · eholk · commit 04ca0ee7b85f · 2012-08-02T19:27:07.000-07:00
yaml --- r: 31606 b: refs/heads/dist-snap c: 110ff31 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: ce6d6511c7fb7f82d2890de578ef9bb28e410281
+refs/heads/dist-snap: 110ff312dfa15fff3457d826302ef575ead0089a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/dist-snap/src/libcore/pipes.rs b/branches/dist-snap/src/libcore/pipes.rs
@@ -899,7 +899,10 @@ struct port_set<T: send> : recv<T> {
     }
 
     fn recv() -> T {
-        option::unwrap(self.try_recv())
+        match move self.try_recv() {
+            some(x) { move x }
+            none { fail ~"port_set: endpoints closed" }
+        }
     }
 
     pure fn peek() -> bool {

Original file line number	Diff line number	Diff line change
`@@ -899,7 +899,10 @@ struct port_set<T: send> : recv<T> {`
`899`	`899`	`}`
`900`	`900`
`901`	`901`	`fn recv() -> T {`
`902`		`- option::unwrap(self.try_recv())`
	`902`	`+ match move self.try_recv() {`
	`903`	`+ some(x) { move x }`
	`904`	`+ none { fail ~"port_set: endpoints closed" }`
	`905`	`+ }`
`903`	`906`	`}`
`904`	`907`
`905`	`908`	`pure fn peek() -> bool {`