diff options
| author | bors <bors@rust-lang.org> | 2015-12-17 20:08:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-17 20:08:48 +0000 |
| commit | 48700be9cbf04d798a6f6ab65c50ab0afe86bc94 (patch) | |
| tree | 6df62088cb4174df4b45e679e8fe7c6e8cb26a92 /src/libstd | |
| parent | 6734dccc3149d62d36a41979424e61dce4473267 (diff) | |
| parent | 7ad8fb9f3c2cea5bee14c1cafb70f024502eff64 (diff) | |
| download | rust-48700be9cbf04d798a6f6ab65c50ab0afe86bc94.tar.gz rust-48700be9cbf04d798a6f6ab65c50ab0afe86bc94.zip | |
Auto merge of #30445 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #30370, #30404, #30415, #30419, #30428, #30437, #30439, #30441, #30442, #30443 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/prelude/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/primitive_docs.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 054f281c070..0f8b2f6e17b 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -25,7 +25,7 @@ //! //! # How to read this documentation //! -//! If you already know the name of what you are looking for the fastest way to +//! If you already know the name of what you are looking for, the fastest way to //! find it is to use the <a href="#" onclick="focusSearchBar();">search //! bar</a> at the top of the page. //! diff --git a/src/libstd/prelude/mod.rs b/src/libstd/prelude/mod.rs index bda4cdfb437..04568ad85bf 100644 --- a/src/libstd/prelude/mod.rs +++ b/src/libstd/prelude/mod.rs @@ -43,7 +43,7 @@ //! //! [`std::io::prelude`]: ../io/prelude/index.html //! -//! The differece between 'the prelude' and these other preludes is that they +//! The difference between 'the prelude' and these other preludes is that they //! are not automatically `use`'d, and must be imported manually. This is still //! easier than importing all of their consitutent components. //! diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index afeb4231aba..ed59c51b0f0 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -333,7 +333,7 @@ mod prim_slice { } /// let ptr = story.as_ptr(); /// let len = story.len(); /// -/// // story has thirteen bytes +/// // story has nineteen bytes /// assert_eq!(19, len); /// /// // We can re-build a str out of ptr and len. This is all unsafe becuase |
