about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-25 16:08:01 +0000
committerbors <bors@rust-lang.org>2018-11-25 16:08:01 +0000
commit5bd451b26580de465d59ed5389209ed191b7dbdd (patch)
treedc2e1499910466e79efee5f35d7e60fd578d4d1b /src/libcore
parente9bca7a993d740291568c57eeef797b175c591cf (diff)
parentcd17b1d4b684df5fb04d0ee08342446463d20b18 (diff)
downloadrust-5bd451b26580de465d59ed5389209ed191b7dbdd.tar.gz
rust-5bd451b26580de465d59ed5389209ed191b7dbdd.zip
Auto merge of #56215 - pietroalbini:rollup, r=pietroalbini
Rollup of 14 pull requests

Successful merges:

 - #56024 (Don't auto-inline const functions)
 - #56045 (Check arg/ret sizedness at ExprKind::Path)
 - #56072 (Stabilize macro_literal_matcher)
 - #56075 (Encode a custom "producers" section in wasm files)
 - #56100 (generator fields are not necessarily initialized)
 - #56101 (Incorporate `dyn` into more comments and docs.)
 - #56144 (Fix BTreeSet and BTreeMap gdb pretty-printers)
 - #56151 (Move a flaky process test out of libstd)
 - #56170 (Fix self profiler ICE on Windows)
 - #56176 (Panic setup msg)
 - #56204 (Suggest correct enum variant on typo)
 - #56207 (Stabilize the int_to_from_bytes feature)
 - #56210 (read_c_str should call the AllocationExtra hooks)
 - #56211 ([master] Forward-ports from beta)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/num/mod.rs48
-rw-r--r--src/libcore/raw.rs2
2 files changed, 13 insertions, 37 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 30b7b454684..9deae124829 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -1921,12 +1921,10 @@ big-endian (network) byte order.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let bytes = ", $swap_op, stringify!($SelfT), ".to_be_bytes();
 assert_eq!(bytes, ", $be_bytes, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn to_be_bytes(self) -> [u8; mem::size_of::<Self>()] {
@@ -1941,12 +1939,10 @@ little-endian byte order.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let bytes = ", $swap_op, stringify!($SelfT), ".to_le_bytes();
 assert_eq!(bytes, ", $le_bytes, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn to_le_bytes(self) -> [u8; mem::size_of::<Self>()] {
@@ -1969,8 +1965,6 @@ instead.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let bytes = ", $swap_op, stringify!($SelfT), ".to_ne_bytes();
 assert_eq!(bytes, if cfg!(target_endian = \"big\") {
         ", $be_bytes, "
@@ -1978,7 +1972,7 @@ assert_eq!(bytes, if cfg!(target_endian = \"big\") {
         ", $le_bytes, "
     });
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn to_ne_bytes(self) -> [u8; mem::size_of::<Self>()] {
@@ -1993,12 +1987,10 @@ big endian.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let value = ", stringify!($SelfT), "::from_be_bytes(", $be_bytes, ");
 assert_eq!(value, ", $swap_op, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn from_be_bytes(bytes: [u8; mem::size_of::<Self>()]) -> Self {
@@ -2014,12 +2006,10 @@ little endian.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let value = ", stringify!($SelfT), "::from_le_bytes(", $le_bytes, ");
 assert_eq!(value, ", $swap_op, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn from_le_bytes(bytes: [u8; mem::size_of::<Self>()]) -> Self {
@@ -2041,8 +2031,6 @@ appropriate instead.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let value = ", stringify!($SelfT), "::from_ne_bytes(if cfg!(target_endian = \"big\") {
         ", $be_bytes, "
     } else {
@@ -2050,7 +2038,7 @@ let value = ", stringify!($SelfT), "::from_ne_bytes(if cfg!(target_endian = \"bi
     });
 assert_eq!(value, ", $swap_op, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn from_ne_bytes(bytes: [u8; mem::size_of::<Self>()]) -> Self {
@@ -3663,12 +3651,10 @@ big-endian (network) byte order.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let bytes = ", $swap_op, stringify!($SelfT), ".to_be_bytes();
 assert_eq!(bytes, ", $be_bytes, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn to_be_bytes(self) -> [u8; mem::size_of::<Self>()] {
@@ -3683,12 +3669,10 @@ little-endian byte order.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let bytes = ", $swap_op, stringify!($SelfT), ".to_le_bytes();
 assert_eq!(bytes, ", $le_bytes, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn to_le_bytes(self) -> [u8; mem::size_of::<Self>()] {
@@ -3711,8 +3695,6 @@ instead.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let bytes = ", $swap_op, stringify!($SelfT), ".to_ne_bytes();
 assert_eq!(bytes, if cfg!(target_endian = \"big\") {
         ", $be_bytes, "
@@ -3720,7 +3702,7 @@ assert_eq!(bytes, if cfg!(target_endian = \"big\") {
         ", $le_bytes, "
     });
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn to_ne_bytes(self) -> [u8; mem::size_of::<Self>()] {
@@ -3735,12 +3717,10 @@ big endian.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let value = ", stringify!($SelfT), "::from_be_bytes(", $be_bytes, ");
 assert_eq!(value, ", $swap_op, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn from_be_bytes(bytes: [u8; mem::size_of::<Self>()]) -> Self {
@@ -3756,12 +3736,10 @@ little endian.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let value = ", stringify!($SelfT), "::from_le_bytes(", $le_bytes, ");
 assert_eq!(value, ", $swap_op, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn from_le_bytes(bytes: [u8; mem::size_of::<Self>()]) -> Self {
@@ -3783,8 +3761,6 @@ appropriate instead.
 # Examples
 
 ```
-#![feature(int_to_from_bytes)]
-
 let value = ", stringify!($SelfT), "::from_ne_bytes(if cfg!(target_endian = \"big\") {
         ", $be_bytes, "
     } else {
@@ -3792,7 +3768,7 @@ let value = ", stringify!($SelfT), "::from_ne_bytes(if cfg!(target_endian = \"bi
     });
 assert_eq!(value, ", $swap_op, ");
 ```"),
-            #[unstable(feature = "int_to_from_bytes", issue = "52963")]
+            #[stable(feature = "int_to_from_bytes", since = "1.32.0")]
             #[rustc_const_unstable(feature = "const_int_conversion")]
             #[inline]
             pub const fn from_ne_bytes(bytes: [u8; mem::size_of::<Self>()]) -> Self {
diff --git a/src/libcore/raw.rs b/src/libcore/raw.rs
index 495b9afe860..3d4bccb4f9d 100644
--- a/src/libcore/raw.rs
+++ b/src/libcore/raw.rs
@@ -21,7 +21,7 @@
 /// The representation of a trait object like `&SomeTrait`.
 ///
 /// This struct has the same layout as types like `&SomeTrait` and
-/// `Box<AnotherTrait>`.
+/// `Box<dyn AnotherTrait>`.
 ///
 /// `TraitObject` is guaranteed to match layouts, but it is not the
 /// type of trait objects (e.g. the fields are not directly accessible