From 7a365e4aa4386ed692163517e3cf42eaed68b786 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Thu, 6 Dec 2012 19:27:44 -0800 Subject: [PATCH] make bblum happy --- src/libstd/sync.rs | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs index 86b9f03313f1..a373a201ffee 100644 --- a/src/libstd/sync.rs +++ b/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 { sem: &Sem } -impl SemRelease : Drop { +impl SemReleaseGeneric : 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 } }