diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-02 07:12:53 -0800 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-02 07:12:53 -0800 |
| commit | 5515fd5c8cf65a8eebd43ddb0de6ff920a509ece (patch) | |
| tree | 4e3d85a43f684fd9d3b2e80a6a9178f90e63d7ce /src/libstd/sync.rs | |
| parent | aa3505d8ff043f0c1da62de4f517eed6defb6187 (diff) | |
| parent | 2304fe6208404ce952aaa37e7634db570ff71f6c (diff) | |
| download | rust-5515fd5c8cf65a8eebd43ddb0de6ff920a509ece.tar.gz rust-5515fd5c8cf65a8eebd43ddb0de6ff920a509ece.zip | |
Merge remote-tracking branch 'remotes/origin/incoming' into incoming
Diffstat (limited to 'src/libstd/sync.rs')
| -rw-r--r-- | src/libstd/sync.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs index 39d3fd569a6..a8a609b1f8a 100644 --- a/src/libstd/sync.rs +++ b/src/libstd/sync.rs @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -19,7 +19,7 @@ use core::cell::Cell; use core::option; use core::pipes; use core::prelude::*; -use core::private::{Exclusive, exclusive}; +use core::unstable::{Exclusive, exclusive}; use core::ptr; use core::task; use core::util; @@ -87,7 +87,7 @@ enum Sem<Q> = Exclusive<SemInner<Q>>; #[doc(hidden)] fn new_sem<Q:Owned>(count: int, q: Q) -> Sem<Q> { Sem(exclusive(SemInner { - mut count: count, waiters: new_waitqueue(), blocked: q })) + count: count, waiters: new_waitqueue(), blocked: q })) } #[doc(hidden)] fn new_sem_and_signal(count: int, num_condvars: uint) |