Skip to content

Commit 22a5ebd

Browse files
committed
auto merge of #10020 : mletterle/rust/documentation-fixes, r=thestinger
I'm planning on doing more updates, but the section in the tutorial stood out at me since the 'rust' tool no longer exists, this should probably be removed to lessen confusion.
2 parents a7453ad + d83c5f7 commit 22a5ebd

File tree

3 files changed

+3
-19
lines changed

3 files changed

+3
-19
lines changed

doc/rust.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3168,7 +3168,7 @@ Raw pointers (`*`)
31683168
: Raw pointers are pointers without safety or liveness guarantees.
31693169
Raw pointers are written `*content`,
31703170
for example `*int` means a raw pointer to an integer.
3171-
Copying or dropping a raw pointer is has no effect on the lifecycle of any other value.
3171+
Copying or dropping a raw pointer has no effect on the lifecycle of any other value.
31723172
Dereferencing a raw pointer or converting it to any other pointer type is an [`unsafe` operation](#unsafe-functions).
31733173
Raw pointers are generally discouraged in Rust code;
31743174
they exist to support interoperability with foreign code,

doc/tutorial.md

-16
Original file line numberDiff line numberDiff line change
@@ -151,22 +151,6 @@ declaration to appear at the top level of the file: all statements must
151151
live inside a function. Rust programs can also be compiled as
152152
libraries, and included in other programs.
153153

154-
## Using the rust tool
155-
156-
While using `rustc` directly to generate your executables, and then
157-
running them manually is a perfectly valid way to test your code,
158-
for smaller projects, prototypes, or if you're a beginner, it might be
159-
more convenient to use the `rust` tool.
160-
161-
The `rust` tool provides central access to the other rust tools,
162-
as well as handy shortcuts for directly running source files.
163-
For example, if you have a file `foo.rs` in your current directory,
164-
`rust run foo.rs` would attempt to compile it and, if successful,
165-
directly run the resulting binary.
166-
167-
To get a list of all available commands, simply call `rust` without any
168-
argument.
169-
170154
## Editing Rust code
171155

172156
There are vim highlighting and indentation scripts in the Rust source

src/libstd/rt/io/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
1313
This module defines the Rust interface for synchronous I/O.
1414
It models byte-oriented input and output with the Reader and Writer traits.
15-
Types that implement both `Reader` and `Writer` and called 'streams',
16-
and automatically implement trait `Stream`.
15+
Types that implement both `Reader` and `Writer` are called 'streams',
16+
and automatically implement the `Stream` trait.
1717
Implementations are provided for common I/O streams like
1818
file, TCP, UDP, Unix domain sockets.
1919
Readers and Writers may be composed to add capabilities like string

0 commit comments

Comments
 (0)