diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-08-28 11:11:15 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-08-28 14:33:18 -0700 |
| commit | cfbc7cbdc7cd09490c7c723758329b5ba78e5f9f (patch) | |
| tree | 404292a41b0f966a85bfe123a97487a8c8ef9626 /src/libstd | |
| parent | e9b7ce6f57e8ca74dfdb16ba91fcae38d2c44798 (diff) | |
| download | rust-cfbc7cbdc7cd09490c7c723758329b5ba78e5f9f.tar.gz rust-cfbc7cbdc7cd09490c7c723758329b5ba78e5f9f.zip | |
Convert core::pipes to camel case
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/comm.rs | 10 | ||||
| -rw-r--r-- | src/libstd/sync.rs | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/libstd/comm.rs b/src/libstd/comm.rs index 639b21e208a..1a07fa850d5 100644 --- a/src/libstd/comm.rs +++ b/src/libstd/comm.rs @@ -11,14 +11,14 @@ Higher level communication abstractions. // Make sure we follow the new conventions #[forbid(non_camel_case_types)]; -import pipes::{channel, recv, chan, port, selectable}; +import pipes::{Channel, Recv, Chan, Port, Selectable}; export DuplexStream; /// An extension of `pipes::stream` that allows both sending and receiving. -struct DuplexStream<T: send, U: send> : channel<T>, recv<U>, selectable { - priv chan: chan<T>; - priv port: port<U>; +struct DuplexStream<T: send, U: send> : Channel<T>, Recv<U>, Selectable { + priv chan: Chan<T>; + priv port: Port <U>; fn send(+x: T) { self.chan.send(x) @@ -40,7 +40,7 @@ struct DuplexStream<T: send, U: send> : channel<T>, recv<U>, selectable { self.port.peek() } - pure fn header() -> *pipes::packet_header { + pure fn header() -> *pipes::PacketHeader { self.port.header() } } diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs index a1416177a6a..5e35454da84 100644 --- a/src/libstd/sync.rs +++ b/src/libstd/sync.rs @@ -19,13 +19,13 @@ import unsafe::{Exclusive, exclusive}; // Each waiting task receives on one of these. #[doc(hidden)] -type WaitEnd = pipes::port_one<()>; +type WaitEnd = pipes::PortOne<()>; #[doc(hidden)] -type SignalEnd = pipes::chan_one<()>; +type SignalEnd = pipes::ChanOne<()>; // A doubly-ended queue of waiting tasks. #[doc(hidden)] -struct Waitqueue { head: pipes::port<SignalEnd>; - tail: pipes::chan<SignalEnd>; } +struct Waitqueue { head: pipes::Port<SignalEnd>; + tail: pipes::Chan<SignalEnd>; } fn new_waitqueue() -> Waitqueue { let (block_tail, block_head) = pipes::stream(); @@ -928,8 +928,8 @@ mod tests { assert woken == 0; } struct SendOnFailure { - c: pipes::chan<()>; - new(+c: pipes::chan<()>) { self.c = c; } + c: pipes::Chan<()>; + new(+c: pipes::Chan<()>) { self.c = c; } drop { self.c.send(()); } } } |
