---

yaml
---
r: 33981
b: refs/heads/snap-stage3
c: 7a365e4
h: refs/heads/master
i:
  33979: 8f3fc4b
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 35f36808ffd28fd1195147890f49b6284bb97130
+refs/heads/snap-stage3: 7a365e4aa4386ed692163517e3cf42eaed68b786
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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
     }
 }