Skip to content

Commit ecd08b9

Browse files
author
Nick Desaulniers
committed
Swap return value of pipes::init Fixes #4501 
1 parent 24e85ac commit ecd08b9

13 files changed

+47
-64
lines changed

‎src/libstd/comm.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ mod pipesy {
376376
priv use core::kinds::Owned;
377377
use ptr::to_mut_unsafe_ptr;
378378

379-
pub fn init<T: Owned>() -> (client::Oneshot<T>, server::Oneshot<T>) {
379+
pub fn init<T: Owned>() -> (server::Oneshot<T>, client::Oneshot<T>) {
380380
pub use core::pipes::HasBuffer;
381381

382382
let buffer = ~::core::pipes::Buffer {
@@ -466,7 +466,7 @@ mod pipesy {
466466

467467
/// Initialiase a (send-endpoint, recv-endpoint) oneshot pipe pair.
468468
pub fn oneshot<T: Owned>() -> (PortOne<T>, ChanOne<T>) {
469-
let (chan, port) = oneshot::init();
469+
let (port, chan) = oneshot::init();
470470
(PortOne::new(port), ChanOne::new(chan))
471471
}
472472

@@ -550,7 +550,7 @@ mod pipesy {
550550
pub mod streamp {
551551
priv use core::kinds::Owned;
552552

553-
pub fn init<T: Owned>() -> (client::Open<T>, server::Open<T>) {
553+
pub fn init<T: Owned>() -> (server::Open<T>, client::Open<T>) {
554554
pub use core::pipes::HasBuffer;
555555
::core::pipes::entangle()
556556
}
@@ -567,7 +567,7 @@ mod pipesy {
567567
::core::option::Option<Open<T>> {
568568
{
569569
use super::data;
570-
let (c, s) = ::core::pipes::entangle();
570+
let (s, c) = ::core::pipes::entangle();
571571
let message = data(x_0, s);
572572
if ::core::pipes::send(pipe, message) {
573573
::core::pipes::rt::make_some(c)
@@ -579,7 +579,7 @@ mod pipesy {
579579
pub fn data<T: Owned>(pipe: Open<T>, x_0: T) -> Open<T> {
580580
{
581581
use super::data;
582-
let (c, s) = ::core::pipes::entangle();
582+
let (s, c) = ::core::pipes::entangle();
583583
let message = data(x_0, s);
584584
::core::pipes::send(pipe, message);
585585
c
@@ -615,7 +615,7 @@ mod pipesy {
615615
616616
*/
617617
pub fn stream<T:Owned>() -> (Port<T>, Chan<T>) {
618-
let (c, s) = streamp::init();
618+
let (s, c) = streamp::init();
619619

620620
(Port {
621621
endp: Some(s)

‎src/libstd/pipes.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,11 @@ pub fn packet<T>() -> *mut Packet<T> {
237237
pub fn entangle_buffer<T:Owned,Tstart:Owned>(
238238
mut buffer: ~Buffer<T>,
239239
init: &fn(*libc::c_void, x: &mut T) -> *mut Packet<Tstart>)
240-
-> (SendPacketBuffered<Tstart, T>, RecvPacketBuffered<Tstart, T>) {
240+
-> (RecvPacketBuffered<Tstart, T>, SendPacketBuffered<Tstart, T>) {
241241
unsafe {
242242
let p = init(transmute_copy(&buffer), &mut buffer.data);
243243
forget(buffer);
244-
(SendPacketBuffered(p), RecvPacketBuffered(p))
244+
(RecvPacketBuffered(p), SendPacketBuffered(p))
245245
}
246246
}
247247

@@ -775,9 +775,9 @@ pub fn RecvPacketBuffered<T,Tbuffer>(p: *mut Packet<T>)
775775
}
776776
}
777777

778-
pub fn entangle<T>() -> (SendPacket<T>, RecvPacket<T>) {
778+
pub fn entangle<T>() -> (RecvPacket<T>, SendPacket<T>) {
779779
let p = packet();
780-
(SendPacket(p), RecvPacket(p))
780+
(RecvPacket(p), SendPacket(p))
781781
}
782782

783783
/** Receives a message from one of two endpoints.

‎src/libsyntax/ext/pipes/pipec.rs

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ impl gen_send for message {
8989
}
9090
else {
9191
let pat = match (this.dir, next.dir) {
92-
(send, send) => "(c, s)",
93-
(send, recv) => "(s, c)",
94-
(recv, send) => "(s, c)",
95-
(recv, recv) => "(c, s)"
92+
(send, send) => "(s, c)",
93+
(send, recv) => "(c, s)",
94+
(recv, send) => "(c, s)",
95+
(recv, recv) => "(s, c)"
9696
};
9797

9898
body += fmt!("let %s = ::std::pipes::entangle();\n", pat);
@@ -317,30 +317,13 @@ impl gen_init for protocol {
317317
let start_state = self.states[0];
318318
319319
let body = if !self.is_bounded() {
320-
match start_state.dir {
321-
send => quote_expr!( ::std::pipes::entangle() ),
322-
recv => {
323-
quote_expr!({
324-
let (s, c) = ::std::pipes::entangle();
325-
(c, s)
326-
})
327-
}
328-
}
320+
quote_expr!( ::std::pipes::entangle() )
329321
}
330322
else {
331-
let body = self.gen_init_bounded(ext_cx);
332-
match start_state.dir {
333-
send => body,
334-
recv => {
335-
quote_expr!({
336-
let (s, c) = $body;
337-
(c, s)
338-
})
339-
}
340-
}
323+
self.gen_init_bounded(ext_cx)
341324
};
342325
343-
cx.parse_item(fmt!("pub fn init%s() -> (client::%s, server::%s)\
326+
cx.parse_item(fmt!("pub fn init%s() -> (server::%s, client::%s)\
344327
{ pub use std::pipes::HasBuffer; %s }",
345328
start_state.generics.to_source(cx),
346329
start_state.to_ty(cx).to_source(cx),

‎src/test/bench/msgsend-ring-pipes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fn main() {
7373
let num_tasks = uint::from_str(args[1]).get();
7474
let msg_per_task = uint::from_str(args[2]).get();
7575

76-
let (num_chan, num_port) = ring::init();
76+
let (num_port, num_chan) = ring::init();
7777
let mut num_chan = Cell(num_chan);
7878

7979
let start = time::precise_time_s();
@@ -83,7 +83,7 @@ fn main() {
8383

8484
for uint::range(1u, num_tasks) |i| {
8585
//error!("spawning %?", i);
86-
let (new_chan, num_port) = ring::init();
86+
let (num_port, new_chan) = ring::init();
8787
let num_chan2 = Cell(num_chan.take());
8888
let num_port = Cell(num_port);
8989
let new_future = do future::spawn || {

‎src/test/bench/pingpong.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ endpoint is passed to the new task.
8383
8484
*/
8585
pub fn spawn_service<T:Owned,Tb:Owned>(
86-
init: extern fn() -> (SendPacketBuffered<T, Tb>,
87-
RecvPacketBuffered<T, Tb>),
86+
init: extern fn() -> (RecvPacketBuffered<T, Tb>,
87+
SendPacketBuffered<T, Tb>),
8888
service: ~fn(v: RecvPacketBuffered<T, Tb>))
8989
-> SendPacketBuffered<T, Tb> {
90-
let (client, server) = init();
90+
let (server, client) = init();
9191

9292
// This is some nasty gymnastics required to safely move the pipe
9393
// into a new task.
@@ -104,11 +104,11 @@ receive state.
104104
105105
*/
106106
pub fn spawn_service_recv<T:Owned,Tb:Owned>(
107-
init: extern fn() -> (RecvPacketBuffered<T, Tb>,
108-
SendPacketBuffered<T, Tb>),
107+
init: extern fn() -> (SendPacketBuffered<T, Tb>,
108+
RecvPacketBuffered<T, Tb>),
109109
service: ~fn(v: SendPacketBuffered<T, Tb>))
110110
-> RecvPacketBuffered<T, Tb> {
111-
let (client, server) = init();
111+
let (server, client) = init();
112112

113113
// This is some nasty gymnastics required to safely move the pipe
114114
// into a new task.

‎src/test/run-pass/issue-2834.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ proto! streamp (
1818
)
1919

2020
fn rendezvous() {
21-
let (c, s) = streamp::init();
21+
let (s, c) = streamp::init();
2222
let streams: ~[streamp::client::open<int>] = ~[c];
2323

2424
error!("%?", streams[0]);

‎src/test/run-pass/issue-2930.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ proto! stream (
1515
)
1616

1717
pub fn main() {
18-
let (bc, _bp) = stream::init();
18+
let (_bp, bc) = stream::init();
1919

2020
stream::client::send(bc, ~"abc");
2121
}

‎src/test/run-pass/pipe-detect-term.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ proto! oneshot (
3131
pub fn main() {
3232
let iotask = &uv::global_loop::get();
3333

34-
let (chan, port) = oneshot::init();
34+
let (port, chan) = oneshot::init();
3535
let port = Cell(port);
3636
do spawn {
3737
match try_recv(port.take()) {
@@ -47,7 +47,7 @@ pub fn main() {
4747

4848
// Make sure the right thing happens during failure.
4949
fn failtest() {
50-
let (c, p) = oneshot::init();
50+
let (p, c) = oneshot::init();
5151

5252
do task::spawn_with(c) |_c| {
5353
fail!();

‎src/test/run-pass/pipe-peek.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ proto! oneshot (
2222
)
2323

2424
pub fn main() {
25-
let mut (c, p) = oneshot::init();
25+
let mut (p, c) = oneshot::init();
2626

2727
assert!(!pipes::peek(&mut p));
2828

‎src/test/run-pass/pipe-pingpong-bounded.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mod pingpong {
3030
pong: Packet<pong>,
3131
}
3232

33-
pub fn init() -> (client::ping, server::ping) {
33+
pub fn init() -> (server::ping, client::ping) {
3434
let buffer = ~Buffer {
3535
header: BufferHeader(),
3636
data: Packets {
@@ -112,7 +112,7 @@ mod test {
112112
}
113113

114114
pub fn main() {
115-
let (client_, server_) = ::pingpong::init();
115+
let (server_, client_) = ::pingpong::init();
116116
let client_ = Cell(client_);
117117
let server_ = Cell(server_);
118118
do task::spawn {

‎src/test/run-pass/pipe-pingpong-proto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ mod test {
5050
}
5151

5252
pub fn main() {
53-
let (client_, server_) = pingpong::init();
53+
let (server_, client_) = pingpong::init();
5454
let client_ = Cell(client_);
5555
let server_ = Cell(server_);
5656

‎src/test/run-pass/pipe-select.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ proto! stream (
3535
)
3636

3737
pub fn spawn_service<T:Owned,Tb:Owned>(
38-
init: extern fn() -> (SendPacketBuffered<T, Tb>,
39-
RecvPacketBuffered<T, Tb>),
38+
init: extern fn() -> (RecvPacketBuffered<T, Tb>,
39+
SendPacketBuffered<T, Tb>),
4040
service: ~fn(v: RecvPacketBuffered<T, Tb>))
4141
-> SendPacketBuffered<T, Tb> {
42-
let (client, server) = init();
42+
let (server, client) = init();
4343

4444
// This is some nasty gymnastics required to safely move the pipe
4545
// into a new task.
@@ -83,17 +83,17 @@ pub fn main() {
8383
}
8484
});
8585

86-
let (c1, p1) = oneshot::init();
87-
let (_c2, p2) = oneshot::init();
86+
let (p1, c1) = oneshot::init();
87+
let (p2, _c2) = oneshot::init();
8888

8989
let c = send(c, (p1, p2));
9090

9191
sleep(iotask, 100);
9292

9393
signal(c1);
9494

95-
let (_c1, p1) = oneshot::init();
96-
let (c2, p2) = oneshot::init();
95+
let (p1, _c1) = oneshot::init();
96+
let (p2, c2) = oneshot::init();
9797

9898
send(c, (p1, p2));
9999

@@ -105,8 +105,8 @@ pub fn main() {
105105
}
106106

107107
fn test_select2() {
108-
let (ac, ap) = stream::init();
109-
let (bc, bp) = stream::init();
108+
let (ap, ac) = stream::init();
109+
let (bp, bc) = stream::init();
110110

111111
stream::client::send(ac, 42);
112112

@@ -119,8 +119,8 @@ fn test_select2() {
119119

120120
error!("done with first select2");
121121

122-
let (ac, ap) = stream::init();
123-
let (bc, bp) = stream::init();
122+
let (ap, ac) = stream::init();
123+
let (bp, bc) = stream::init();
124124

125125
stream::client::send(bc, ~"abc");
126126

‎src/test/run-pass/pipe-sleep.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ endpoint is passed to the new task.
3434
3535
*/
3636
pub fn spawn_service<T:Owned,Tb:Owned>(
37-
init: extern fn() -> (SendPacketBuffered<T, Tb>,
38-
RecvPacketBuffered<T, Tb>),
37+
init: extern fn() -> (RecvPacketBuffered<T, Tb>,
38+
SendPacketBuffered<T, Tb>),
3939
service: ~fn(v: RecvPacketBuffered<T, Tb>))
4040
-> SendPacketBuffered<T, Tb> {
41-
let (client, server) = init();
41+
let (server, client) = init();
4242

4343
// This is some nasty gymnastics required to safely move the pipe
4444
// into a new task.

0 commit comments

Comments
 (0)