Skip to content

Commit feab095

Browse files
committed
Convert core::pipes::{Packet,Chan_,Port_} into structs
1 parent 90734a0 commit feab095

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

src/libcore/pipes.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ impl PacketHeader {
201201
}
202202

203203
#[doc(hidden)]
204-
pub type Packet<T: Owned> = {
204+
pub struct Packet<T: Owned> {
205205
header: PacketHeader,
206206
mut payload: Option<T>,
207-
};
207+
}
208208

209209
#[doc(hidden)]
210210
pub trait HasBuffer {
@@ -223,19 +223,19 @@ impl<T: Owned> Packet<T>: HasBuffer {
223223

224224
#[doc(hidden)]
225225
pub fn mk_packet<T: Owned>() -> Packet<T> {
226-
{
226+
Packet {
227227
header: PacketHeader(),
228-
mut payload: None
228+
payload: None,
229229
}
230230
}
231231

232232
#[doc(hidden)]
233233
fn unibuffer<T: Owned>() -> ~Buffer<Packet<T>> {
234234
let b = ~{
235235
header: BufferHeader(),
236-
data: {
236+
data: Packet {
237237
header: PacketHeader(),
238-
mut payload: None,
238+
payload: None,
239239
}
240240
};
241241

@@ -1011,15 +1011,19 @@ pub trait Peekable<T> {
10111011
}
10121012

10131013
#[doc(hidden)]
1014-
type Chan_<T:Owned> = { mut endp: Option<streamp::client::Open<T>> };
1014+
struct Chan_<T:Owned> {
1015+
mut endp: Option<streamp::client::Open<T>>,
1016+
}
10151017

10161018
/// An endpoint that can send many messages.
10171019
pub enum Chan<T:Owned> {
10181020
Chan_(Chan_<T>)
10191021
}
10201022

10211023
#[doc(hidden)]
1022-
type Port_<T:Owned> = { mut endp: Option<streamp::server::Open<T>> };
1024+
struct Port_<T:Owned> {
1025+
mut endp: Option<streamp::server::Open<T>>,
1026+
}
10231027

10241028
/// An endpoint that can receive many messages.
10251029
pub enum Port<T:Owned> {
@@ -1034,7 +1038,7 @@ These allow sending or receiving an unlimited number of messages.
10341038
pub fn stream<T:Owned>() -> (Port<T>, Chan<T>) {
10351039
let (c, s) = streamp::init();
10361040

1037-
(Port_({ mut endp: Some(move s) }), Chan_({ mut endp: Some(move c) }))
1041+
(Port_(Port_ { endp: Some(s) }), Chan_(Chan_{ endp: Some(c) }))
10381042
}
10391043

10401044
impl<T: Owned> Chan<T>: GenericChan<T> {

0 commit comments

Comments
 (0)