about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-08-04 12:31:32 +0000
committerbors <bors@rust-lang.org>2015-08-04 12:31:32 +0000
commit4b79add08653d89f08e5a5c94c2132515a1aa30f (patch)
treea83a085f3b640c01c2a8609a3ca6cad5ecd70ce8 /src/libstd
parentf971f862384abdea40064f872308a309a8691e8d (diff)
parent614f6408562a3402af2b58310408b707dce3726c (diff)
downloadrust-4b79add08653d89f08e5a5c94c2132515a1aa30f.tar.gz
rust-4b79add08653d89f08e5a5c94c2132515a1aa30f.zip
Auto merge of #27512 - Manishearth:rollup, r=Manishearth
- Successful merges: #27397, #27398, #27460, #27470, #27491, #27498, #27502
- Failed merges: 
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/prelude/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/prelude/mod.rs b/src/libstd/prelude/mod.rs
index 275f415c6fc..4597db41e90 100644
--- a/src/libstd/prelude/mod.rs
+++ b/src/libstd/prelude/mod.rs
@@ -11,8 +11,8 @@
 //! The Rust Prelude
 //!
 //! Because `std` is required by most serious Rust software, it is
-//! imported at the topmost level of every crate by default, as if the
-//! first line of each crate was
+//! imported at the topmost level of every crate by default, as if
+//! each crate contains the following:
 //!
 //! ```ignore
 //! extern crate std;
@@ -23,7 +23,7 @@
 //! etc.
 //!
 //! Additionally, `std` contains a versioned *prelude* that reexports many of the
-//! most common traits, types and functions. *The contents of the prelude are
+//! most common traits, types, and functions. *The contents of the prelude are
 //! imported into every module by default*.  Implicitly, all modules behave as if
 //! they contained the following [`use` statement][book-use]:
 //!