---

yaml
---
r: 40688
b: refs/heads/dist-snap
c: 7a365e4
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 35f36808ffd28fd1195147890f49b6284bb97130
+refs/heads/dist-snap: 7a365e4aa4386ed692163517e3cf42eaed68b786
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/sync.rs

@@ -158,36 +158,25 @@ impl &Sem<~[mut Waitqueue]> {
 
 // FIXME(#3588) should go inside of access()
 #[doc(hidden)]
-struct SemRelease {
-    sem: &Sem<()>,
-}
+type SemRelease = SemReleaseGeneric<()>;
+type SemAndSignalRelease = SemReleaseGeneric<~[mut Waitqueue]>;
+struct SemReleaseGeneric<Q: Send> { sem: &Sem<Q> }
 
-impl SemRelease : Drop {
+impl<Q: Send> SemReleaseGeneric<Q> : Drop {
     fn finalize(&self) {
         self.sem.release();
     }
 }
 
 fn SemRelease(sem: &r/Sem<()>) -> SemRelease/&r {
-    SemRelease {
+    SemReleaseGeneric {
         sem: sem
     }
 }
 
-#[doc(hidden)]
-struct SemAndSignalRelease {
-    sem: &Sem<~[mut Waitqueue]>,
-}
-
-impl SemAndSignalRelease : Drop {
-    fn finalize(&self) {
-        self.sem.release();
-    }
-}
-
 fn SemAndSignalRelease(sem: &r/Sem<~[mut Waitqueue]>)
     -> SemAndSignalRelease/&r {
-    SemAndSignalRelease {
+    SemReleaseGeneric {
         sem: sem
     }
 }