about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-12-17 20:08:48 +0000
committerbors <bors@rust-lang.org>2015-12-17 20:08:48 +0000
commit48700be9cbf04d798a6f6ab65c50ab0afe86bc94 (patch)
tree6df62088cb4174df4b45e679e8fe7c6e8cb26a92 /src/libcore
parent6734dccc3149d62d36a41979424e61dce4473267 (diff)
parent7ad8fb9f3c2cea5bee14c1cafb70f024502eff64 (diff)
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/libcore')
-rw-r--r--src/libcore/lib.rs6
-rw-r--r--src/libcore/num/mod.rs4
-rw-r--r--src/libcore/ops.rs2
3 files changed, 3 insertions, 9 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 454e2b02b1c..cde86230d75 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -23,12 +23,6 @@
 //! nor does it provide concurrency or I/O. These things require
 //! platform integration, and this library is platform-agnostic.
 //!
-//! *It is not recommended to use the core library*. The stable
-//! functionality of libcore is reexported from the
-//! [standard library](../std/index.html). The composition of this library is
-//! subject to change over time; only the interface exposed through libstd is
-//! intended to be stable.
-//!
 //! # How to use the core library
 //!
 // FIXME: Fill me in with more detail when the interface settles
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 4f3c1256709..8abb12706a5 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -644,7 +644,7 @@ macro_rules! int_impl {
             self.overflowing_shl(rhs).0
         }
 
-        /// Panic-free bitwise shift-left; yields `self >> mask(rhs)`,
+        /// Panic-free bitwise shift-right; yields `self >> mask(rhs)`,
         /// where `mask` removes any high-order bits of `rhs` that
         /// would cause the shift to exceed the bitwidth of the type.
         ///
@@ -1446,7 +1446,7 @@ macro_rules! uint_impl {
             self.overflowing_shl(rhs).0
         }
 
-        /// Panic-free bitwise shift-left; yields `self >> mask(rhs)`,
+        /// Panic-free bitwise shift-right; yields `self >> mask(rhs)`,
         /// where `mask` removes any high-order bits of `rhs` that
         /// would cause the shift to exceed the bitwidth of the type.
         ///
diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs
index 0abbd70762d..dd4702376d4 100644
--- a/src/libcore/ops.rs
+++ b/src/libcore/ops.rs
@@ -1616,7 +1616,7 @@ impl<Idx: fmt::Debug> fmt::Debug for RangeTo<Idx> {
 }
 
 /// The `Deref` trait is used to specify the functionality of dereferencing
-/// operations like `*v`.
+/// operations, like `*v`.
 ///
 /// `Deref` also enables ['`Deref` coercions'][coercions].
 ///