Skip to content

Commit 009c3d8

Browse files
committed
auto merge of #9836 : eriklyon/rust/doc-typos, r=alexcrichton
2 parents 91abfd4 + 8b65a45 commit 009c3d8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

doc/tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2811,7 +2811,7 @@ For every crate you can define a number of metadata items, such as link name, ve
28112811
You can also toggle settings that have crate-global consequences. Both mechanism
28122812
work by providing attributes in the crate root.
28132813

2814-
For example, Rust uniquely identifies crates by their link metadate, which includes
2814+
For example, Rust uniquely identifies crates by their link metadata, which includes
28152815
the link name and the version. It also hashes the filename and the symbols in a binary
28162816
based on the link metadata, allowing you to use two different versions of the same library in a crate
28172817
without conflict.
@@ -2916,7 +2916,7 @@ As well as this line into every module body:
29162916
use std::prelude::*;
29172917
~~~
29182918

2919-
The role of the `prelude` module is to re-exports common definitions from `std`.
2919+
The role of the `prelude` module is to re-export common definitions from `std`.
29202920

29212921
This allows you to use common types and functions like `Option<T>` or `println`
29222922
without needing to import them. And if you need something from `std` that's not in the prelude,

0 commit comments

Comments
 (0)