diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs index 6c7be8a2ae5..c7cd098394c 100644 --- a/src/libcore/pipes.rs +++ b/src/libcore/pipes.rs @@ -201,10 +201,10 @@ impl PacketHeader { } #[doc(hidden)] -pub type Packet = { +pub struct Packet { header: PacketHeader, mut payload: Option, -}; +} #[doc(hidden)] pub trait HasBuffer { @@ -223,9 +223,9 @@ impl Packet: HasBuffer { #[doc(hidden)] pub fn mk_packet() -> Packet { - { + Packet { header: PacketHeader(), - mut payload: None + payload: None, } } @@ -233,9 +233,9 @@ pub fn mk_packet() -> Packet { fn unibuffer() -> ~Buffer> { let b = ~{ header: BufferHeader(), - data: { + data: Packet { header: PacketHeader(), - mut payload: None, + payload: None, } }; @@ -1011,7 +1011,9 @@ pub trait Peekable { } #[doc(hidden)] -type Chan_ = { mut endp: Option> }; +struct Chan_ { + mut endp: Option>, +} /// An endpoint that can send many messages. pub enum Chan { @@ -1019,7 +1021,9 @@ pub enum Chan { } #[doc(hidden)] -type Port_ = { mut endp: Option> }; +struct Port_ { + mut endp: Option>, +} /// An endpoint that can receive many messages. pub enum Port { @@ -1034,7 +1038,7 @@ These allow sending or receiving an unlimited number of messages. pub fn stream() -> (Port, Chan) { let (c, s) = streamp::init(); - (Port_({ mut endp: Some(move s) }), Chan_({ mut endp: Some(move c) })) + (Port_(Port_ { endp: Some(s) }), Chan_(Chan_{ endp: Some(c) })) } impl Chan: GenericChan {