Skip to content

Commit 00c2ecd

Browse files
committed
---
yaml --- r: 80507 b: refs/heads/master c: e1507f3 h: refs/heads/master i: 80505: d42227a 80503: 2123883 v: v3
1 parent be01926 commit 00c2ecd

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
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: bc89ade401e637fcb7d4d1d0b7f356ca359b0e7d
2+
refs/heads/master: e1507f3120a14399af1a4bb097240c9be865634d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
55
refs/heads/try: 71bebebc37fbb229877da88dde13c2f35913bd77

trunk/doc/tutorial-tasks.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,16 @@ concurrency at this writing:
4747

4848
* [`std::task`] - All code relating to tasks and task scheduling,
4949
* [`std::comm`] - The message passing interface,
50-
* [`extra::comm`] - Additional messaging types based on `std::comm`,
50+
* [`std::pipes`] - The underlying messaging infrastructure,
51+
* [`extra::comm`] - Additional messaging types based on `std::pipes`,
5152
* [`extra::sync`] - More exotic synchronization tools, including locks,
5253
* [`extra::arc`] - The Arc (atomically reference counted) type,
5354
for safely sharing immutable data,
5455
* [`extra::future`] - A type representing values that may be computed concurrently and retrieved at a later time.
5556

5657
[`std::task`]: std/task.html
5758
[`std::comm`]: std/comm.html
59+
[`std::pipes`]: std/pipes.html
5860
[`extra::comm`]: extra/comm.html
5961
[`extra::sync`]: extra/sync.html
6062
[`extra::arc`]: extra/arc.html
@@ -123,7 +125,7 @@ receiving messages. Pipes are low-level communication building-blocks and so
123125
come in a variety of forms, each one appropriate for a different use case. In
124126
what follows, we cover the most commonly used varieties.
125127

126-
The simplest way to create a pipe is to use the `comm::stream`
128+
The simplest way to create a pipe is to use the `pipes::stream`
127129
function to create a `(Port, Chan)` pair. In Rust parlance, a *channel*
128130
is a sending endpoint of a pipe, and a *port* is the receiving
129131
endpoint. Consider the following example of calculating two results

trunk/man/rustpkg.1

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ This tool is a package manager for applications written in the Rust language,
1111
available at <\fBhttps://www.rust-lang.org\fR>. It provides commands to build,
1212
install and test Rust programs.
1313

14+
\fBrustpkg\fR is still a work in progress. See \fBdoc/rustpkg.md\fR in the Rust source distribution for future plans.
15+
1416
.SH COMMANDS
1517

1618
.TP
@@ -25,10 +27,6 @@ Remove all generated files from the \fIbuild\fR directory in the target's worksp
2527
Builds the specified target, and all its dependencies, and then installs the
2628
build products into the \fIlib\fR and \fIbin\fR directories of their respective
2729
workspaces.
28-
.TP
29-
\fBtest\fR
30-
Builds the module called \fItest.rs\fR in the specified workspace, and then runs
31-
the resulting executable in test mode.
3230

3331
.SS "BUILD COMMAND"
3432

@@ -58,20 +56,9 @@ of the first entry in RUST_PATH.
5856

5957
Examples:
6058

61-
$ rustpkg install git://github.com/mozilla/servo.git#1.2
59+
$ rustpkg install github.com/mozilla/servo.git#1.2
6260
$ rustpkg install rust-glfw
6361

64-
.SS "TEST COMMAND"
65-
66-
rustpkg test \fI[pkgname]\fR
67-
68-
The test command is a shortcut for the command line:
69-
70-
$ rustc --test <filename> -o <filestem>test~ && ./<filestem>test~
71-
72-
Note the suffix on the output filename (the word "test" followed by a tilde),
73-
which should ensure the file does not clash with a user-generated files.
74-
7562
.SH "ENVIRONMENT"
7663

7764
.TP
@@ -186,7 +173,7 @@ rust, rustc, rustdoc, rusti
186173
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.
187174

188175
.SH "AUTHOR"
189-
See \fBAUTHORS.txt\fR in the rust source distribution. Graydon Hoare
176+
See \fBAUTHORS.txt\fR in the Rust source distribution. Graydon Hoare
190177
<\fI[email protected]\fR> is the project leader.
191178

192179
.SH "COPYRIGHT"

0 commit comments

Comments
 (0)