Skip to content

Commit 1800edd

Browse files
committed
---
yaml --- r: 23556 b: refs/heads/master c: cfbc7cb h: refs/heads/master v: v3
1 parent 3dededc commit 1800edd

31 files changed

+319
-237
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: e9b7ce6f57e8ca74dfdb16ba91fcae38d2c44798
2+
refs/heads/master: cfbc7cbdc7cd09490c7c723758329b5ba78e5f9f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/doc/tutorial.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2966,7 +2966,7 @@ computations in parallel. We might write something like:
29662966

29672967
~~~~
29682968
import task::spawn;
2969-
import pipes::{stream, port, chan};
2969+
import pipes::{stream, Port, Chan};
29702970
29712971
let (chan, port) = stream();
29722972
@@ -3016,7 +3016,7 @@ some other expensive computation and then waiting for the child's result
30163016
to arrive on the port:
30173017

30183018
~~~~
3019-
# import pipes::{stream, port, chan};
3019+
# import pipes::{stream, Port, Chan};
30203020
# fn some_other_expensive_computation() {}
30213021
# let (chan, port) = stream::<int>();
30223022
# chan.send(0);
@@ -3038,7 +3038,7 @@ Here is the function that implements the child task:
30383038

30393039
~~~~
30403040
# import std::comm::DuplexStream;
3041-
# import pipes::{port, chan};
3041+
# import pipes::{Port, Chan};
30423042
fn stringifier(channel: DuplexStream<~str, uint>) {
30433043
let mut value: uint;
30443044
loop {
@@ -3061,7 +3061,7 @@ Here is the code for the parent task:
30613061

30623062
~~~~
30633063
# import std::comm::DuplexStream;
3064-
# import pipes::{port, chan};
3064+
# import pipes::{Port, Chan};
30653065
# import task::spawn;
30663066
# fn stringifier(channel: DuplexStream<~str, uint>) {
30673067
# let mut value: uint;

trunk/src/libcore/core.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ mod comm;
241241
mod task;
242242
//#[warn(non_camel_ase_types)] pipec code continues to trip this warning
243243
mod future;
244+
#[warn(non_camel_case_types)]
244245
mod pipes;
245246

246247
// Runtime and language-primitive support

0 commit comments

Comments
 (0)