Skip to content

Commit 05ef506

Browse files
committed
---
yaml --- r: 80587 b: refs/heads/auto c: e1507f3 h: refs/heads/master i: 80585: c4187d6 80583: 761dbee v: v3
1 parent 6c0f26e commit 05ef506

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: bc89ade401e637fcb7d4d1d0b7f356ca359b0e7d
16+
refs/heads/auto: e1507f3120a14399af1a4bb097240c9be865634d
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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

branches/auto/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)