OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #9836 : eriklyon/rust/doc-typos, r=alexcrichton

Browse Source
This commit is contained in:
bors 2013-10-13 11:31:26 -07:00
commit 009c3d8bae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/tutorial.md
View File

@ -2811,7 +2811,7 @@ For every crate you can define a number of metadata items, such as link name, ve
You can also toggle settings that have crate-global consequences. Both mechanism You can also toggle settings that have crate-global consequences. Both mechanism
work by providing attributes in the crate root. work by providing attributes in the crate root.
For example, Rust uniquely identifies crates by their link metadate, which includes For example, Rust uniquely identifies crates by their link metadata, which includes
the link name and the version. It also hashes the filename and the symbols in a binary the link name and the version. It also hashes the filename and the symbols in a binary
based on the link metadata, allowing you to use two different versions of the same library in a crate based on the link metadata, allowing you to use two different versions of the same library in a crate
without conflict. without conflict.
@ -2916,7 +2916,7 @@ As well as this line into every module body:
use std::prelude::*; use std::prelude::*;
~~~ ~~~
The role of the `prelude` module is to re-exports common definitions from `std`. The role of the `prelude` module is to re-export common definitions from `std`.
This allows you to use common types and functions like `Option<T>` or `println` This allows you to use common types and functions like `Option<T>` or `println`
without needing to import them. And if you need something from `std` that's not in the prelude, without needing to import them. And if you need something from `std` that's not in the prelude,