constify parts of libstd.

Centril · Centril · commit f65b630d33ef · 2018-11-10T01:10:07.000+01:00
diff --git a/src/libcore/time.rs b/src/libcore/time.rs
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
@@ -36,7 +36,7 @@ struct DefaultResizePolicy;
 
 impl DefaultResizePolicy {
     #[inline]
-    fn new() -> DefaultResizePolicy {
+    const fn new() -> DefaultResizePolicy {
         DefaultResizePolicy
     }
 
@@ -69,7 +69,7 @@ impl DefaultResizePolicy {
 
     /// The capacity of the given raw capacity.
     #[inline]
-    fn capacity(&self, raw_cap: usize) -> usize {
+    const fn capacity(&self, raw_cap: usize) -> usize {
         // This doesn't have to be checked for overflow since allocation size
         // in bytes will overflow earlier than multiplication by 10.
         //
@@ -3013,7 +3013,7 @@ impl<'a, K: 'a, V: 'a> VacantEntry<'a, K, V> {
     /// assert_eq!(map.entry("poneyland").key(), &"poneyland");
     /// ```
     #[stable(feature = "map_entry_keys", since = "1.10.0")]
-    pub fn key(&self) -> &K {
+    pub const fn key(&self) -> &K {
         &self.key
     }
 
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
@@ -247,7 +247,7 @@ impl<K, V> RawBucket<K, V> {
 // Buckets hold references to the table.
 impl<K, V, M> FullBucket<K, V, M> {
     /// Borrow a reference to the table.
-    pub fn table(&self) -> &M {
+    pub const fn table(&self) -> &M {
         &self.table
     }
     /// Borrow a mutable reference to the table.
@@ -259,18 +259,18 @@ impl<K, V, M> FullBucket<K, V, M> {
         self.table
     }
     /// Get the raw index.
-    pub fn index(&self) -> usize {
+    pub const fn index(&self) -> usize {
         self.raw.idx
     }
     /// Get the raw bucket.
-    pub fn raw(&self) -> RawBucket<K, V> {
+    pub const fn raw(&self) -> RawBucket<K, V> {
         self.raw
     }
 }
 
 impl<K, V, M> EmptyBucket<K, V, M> {
     /// Borrow a reference to the table.
-    pub fn table(&self) -> &M {
+    pub const fn table(&self) -> &M {
         &self.table
     }
     /// Borrow a mutable reference to the table.
@@ -281,7 +281,7 @@ impl<K, V, M> EmptyBucket<K, V, M> {
 
 impl<K, V, M> Bucket<K, V, M> {
     /// Get the raw index.
-    pub fn index(&self) -> usize {
+    pub const fn index(&self) -> usize {
         self.raw.idx
     }
     /// get the table.
@@ -772,7 +772,7 @@ impl<K, V> RawTable<K, V> {
 
     /// The number of elements ever `put` in the hashtable, minus the number
     /// of elements ever `take`n.
-    pub fn size(&self) -> usize {
+    pub const fn size(&self) -> usize {
         self.size
     }
 
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
@@ -265,12 +265,12 @@ enum FromBytesWithNulErrorKind {
 }
 
 impl FromBytesWithNulError {
-    fn interior_nul(pos: usize) -> FromBytesWithNulError {
+    const fn interior_nul(pos: usize) -> FromBytesWithNulError {
         FromBytesWithNulError {
             kind: FromBytesWithNulErrorKind::InteriorNul(pos),
         }
     }
-    fn not_nul_terminated() -> FromBytesWithNulError {
+    const fn not_nul_terminated() -> FromBytesWithNulError {
         FromBytesWithNulError {
             kind: FromBytesWithNulErrorKind::NotNulTerminated,
         }
@@ -833,7 +833,7 @@ impl NulError {
     /// assert_eq!(nul_error.nul_position(), 7);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn nul_position(&self) -> usize { self.0 }
+    pub const fn nul_position(&self) -> usize { self.0 }
 
     /// Consumes this error, returning the underlying vector of bytes which
     /// generated the error in the first place.
@@ -909,7 +909,7 @@ impl IntoStringError {
 
     /// Access the underlying UTF-8 error that was the cause of this error.
     #[stable(feature = "cstring_into", since = "1.7.0")]
-    pub fn utf8_error(&self) -> Utf8Error {
+    pub const fn utf8_error(&self) -> Utf8Error {
         self.error
     }
 }
@@ -1091,7 +1091,7 @@ impl CStr {
     /// [`CString`]: struct.CString.html
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn as_ptr(&self) -> *const c_char {
+    pub const fn as_ptr(&self) -> *const c_char {
         self.inner.as_ptr()
     }
 
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
@@ -633,7 +633,7 @@ impl<W> IntoInnerError<W> {
     /// };
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn error(&self) -> &Error { &self.1 }
+    pub const fn error(&self) -> &Error { &self.1 }
 
     /// Returns the buffered writer instance which generated the error.
     ///
diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs
@@ -104,7 +104,7 @@ impl<T> Cursor<T> {
     /// # force_inference(&buff);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn new(inner: T) -> Cursor<T> {
+    pub const fn new(inner: T) -> Cursor<T> {
         Cursor { pos: 0, inner: inner }
     }
 
@@ -138,7 +138,7 @@ impl<T> Cursor<T> {
     /// let reference = buff.get_ref();
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn get_ref(&self) -> &T { &self.inner }
+    pub const fn get_ref(&self) -> &T { &self.inner }
 
     /// Gets a mutable reference to the underlying value in this cursor.
     ///
@@ -179,7 +179,7 @@ impl<T> Cursor<T> {
     /// assert_eq!(buff.position(), 1);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn position(&self) -> u64 { self.pos }
+    pub const fn position(&self) -> u64 { self.pos }
 
     /// Sets the position of this cursor.
     ///
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
@@ -885,7 +885,7 @@ impl Initializer {
     /// Returns a new `Initializer` which will zero out buffers.
     #[unstable(feature = "read_initializer", issue = "42788")]
     #[inline]
-    pub fn zeroing() -> Initializer {
+    pub const fn zeroing() -> Initializer {
         Initializer(true)
     }
 
@@ -906,7 +906,7 @@ impl Initializer {
     /// Indicates if a buffer should be initialized.
     #[unstable(feature = "read_initializer", issue = "42788")]
     #[inline]
-    pub fn should_initialize(&self) -> bool {
+    pub const fn should_initialize(&self) -> bool {
         self.0
     }
 
@@ -1653,7 +1653,7 @@ impl<T, U> Chain<T, U> {
     /// }
     /// ```
     #[stable(feature = "more_io_inner_methods", since = "1.20.0")]
-    pub fn get_ref(&self) -> (&T, &U) {
+    pub const fn get_ref(&self) -> (&T, &U) {
         (&self.first, &self.second)
     }
 
@@ -1780,7 +1780,7 @@ impl<T> Take<T> {
     /// }
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn limit(&self) -> u64 { self.limit }
+    pub const fn limit(&self) -> u64 { self.limit }
 
     /// Sets the number of bytes that can be read before this instance will
     /// return EOF. This is the same as constructing a new `Take` instance, so
@@ -1856,7 +1856,7 @@ impl<T> Take<T> {
     /// }
     /// ```
     #[stable(feature = "more_io_inner_methods", since = "1.20.0")]
-    pub fn get_ref(&self) -> &T {
+    pub const fn get_ref(&self) -> &T {
         &self.inner
     }
 
diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs
@@ -99,7 +99,7 @@ pub struct Empty { _priv: () }
 /// assert!(buffer.is_empty());
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-pub fn empty() -> Empty { Empty { _priv: () } }
+pub const fn empty() -> Empty { Empty { _priv: () } }
 
 #[stable(feature = "rust1", since = "1.0.0")]
 impl Read for Empty {
@@ -199,7 +199,7 @@ pub struct Sink { _priv: () }
 /// assert_eq!(num_bytes, 5);
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-pub fn sink() -> Sink { Sink { _priv: () } }
+pub const fn sink() -> Sink { Sink { _priv: () } }
 
 #[stable(feature = "rust1", since = "1.0.0")]
 impl Write for Sink {
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
@@ -475,7 +475,7 @@ impl SocketAddrV6 {
     /// assert_eq!(socket.flowinfo(), 10);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn flowinfo(&self) -> u32 {
+    pub const fn flowinfo(&self) -> u32 {
         self.inner.sin6_flowinfo
     }
 
@@ -515,7 +515,7 @@ impl SocketAddrV6 {
     /// assert_eq!(socket.scope_id(), 78);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn scope_id(&self) -> u32 {
+    pub const fn scope_id(&self) -> u32 {
         self.inner.sin6_scope_id
     }
 
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs
@@ -402,7 +402,7 @@ impl Ipv4Addr {
     /// assert_eq!(addr.octets(), [127, 0, 0, 1]);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn octets(&self) -> [u8; 4] {
+    pub  fn octets(&self) -> [u8; 4] {
         let bits = u32::from_be(self.inner.s_addr);
         [(bits >> 24) as u8, (bits >> 16) as u8, (bits >> 8) as u8, bits as u8]
     }
@@ -424,7 +424,7 @@ impl Ipv4Addr {
     /// assert_eq!(Ipv4Addr::new(45, 22, 13, 197).is_unspecified(), false);
     /// ```
     #[stable(feature = "ip_shared", since = "1.12.0")]
-    pub fn is_unspecified(&self) -> bool {
+    pub const fn is_unspecified(&self) -> bool {
         self.inner.s_addr == 0
     }
 
@@ -862,7 +862,6 @@ impl Ipv6Addr {
     /// let addr = Ipv6Addr::new(0, 0, 0, 0, 0, 0xffff, 0xc00a, 0x2ff);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[rustc_const_unstable(feature = "const_ip")]
     pub const fn new(a: u16, b: u16, c: u16, d: u16, e: u16, f: u16,
                      g: u16, h: u16) -> Ipv6Addr {
         Ipv6Addr {
@@ -1224,7 +1223,7 @@ impl Ipv6Addr {
     ///            [255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
     /// ```
     #[stable(feature = "ipv6_to_octets", since = "1.12.0")]
-    pub fn octets(&self) -> [u8; 16] {
+    pub const fn octets(&self) -> [u8; 16] {
         self.inner.s6_addr
     }
 }
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
@@ -439,15 +439,15 @@ impl<'a> PrefixComponent<'a> {
     ///
     /// [`Prefix`]: enum.Prefix.html
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn kind(&self) -> Prefix<'a> {
+    pub const fn kind(&self) -> Prefix<'a> {
         self.parsed
     }
 
     /// Returns the raw [`OsStr`] slice for this prefix.
     ///
     /// [`OsStr`]: ../../std/ffi/struct.OsStr.html
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn as_os_str(&self) -> &'a OsStr {
+    pub const fn as_os_str(&self) -> &'a OsStr {
         self.raw
     }
 }
@@ -1918,7 +1918,7 @@ impl Path {
     /// [`None`]: ../../std/option/enum.Option.html#variant.None
     /// [`parent`]: struct.Path.html#method.parent
     #[stable(feature = "path_ancestors", since = "1.28.0")]
-    pub fn ancestors(&self) -> Ancestors {
+    pub const fn ancestors(&self) -> Ancestors {
         Ancestors {
             next: Some(&self),
         }
@@ -2267,7 +2267,7 @@ impl Path {
     /// println!("{}", path.display());
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn display(&self) -> Display {
+    pub const fn display(&self) -> Display {
         Display { path: self }
     }
 
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
@@ -926,7 +926,7 @@ impl Stdio {
     /// assert_eq!(String::from_utf8_lossy(&output.stdout), "!dlrow ,olleH\n");
     /// ```
     #[stable(feature = "process", since = "1.0.0")]
-    pub fn piped() -> Stdio { Stdio(imp::Stdio::MakePipe) }
+    pub const fn piped() -> Stdio { Stdio(imp::Stdio::MakePipe) }
 
     /// The child inherits from the corresponding parent descriptor.
     ///
@@ -961,7 +961,7 @@ impl Stdio {
     /// println!("You piped in the reverse of: {}", String::from_utf8_lossy(&output.stdout));
     /// ```
     #[stable(feature = "process", since = "1.0.0")]
-    pub fn inherit() -> Stdio { Stdio(imp::Stdio::Inherit) }
+    pub const fn inherit() -> Stdio { Stdio(imp::Stdio::Inherit) }
 
     /// This stream will be ignored. This is the equivalent of attaching the
     /// stream to `/dev/null`
@@ -998,7 +998,7 @@ impl Stdio {
     /// // Ignores any piped-in input
     /// ```
     #[stable(feature = "process", since = "1.0.0")]
-    pub fn null() -> Stdio { Stdio(imp::Stdio::Null) }
+    pub const fn null() -> Stdio { Stdio(imp::Stdio::Null) }
 }
 
 impl FromInner<imp::Stdio> for Stdio {
diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs
@@ -72,7 +72,7 @@ impl WaitTimeoutResult {
     /// }
     /// ```
     #[stable(feature = "wait_timeout", since = "1.5.0")]
-    pub fn timed_out(&self) -> bool {
+    pub const fn timed_out(&self) -> bool {
         self.0
     }
 }
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
@@ -785,7 +785,7 @@ pub fn sync_channel<T>(bound: usize) -> (SyncSender<T>, Receiver<T>) {
 ////////////////////////////////////////////////////////////////////////////////
 
 impl<T> Sender<T> {
-    fn new(inner: Flavor<T>) -> Sender<T> {
+    const fn new(inner: Flavor<T>) -> Sender<T> {
         Sender {
             inner: UnsafeCell::new(inner),
         }
@@ -1469,7 +1469,7 @@ impl<T> Receiver<T> {
     /// assert_eq!(iter.next(), None);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn iter(&self) -> Iter<T> {
+    pub const fn iter(&self) -> Iter<T> {
         Iter { rx: self }
     }
 
@@ -1512,7 +1512,7 @@ impl<T> Receiver<T> {
     /// assert_eq!(iter.next(), None);
     /// ```
     #[stable(feature = "receiver_try_iter", since = "1.15.0")]
-    pub fn try_iter(&self) -> TryIter<T> {
+    pub const fn try_iter(&self) -> TryIter<T> {
         TryIter { rx: self }
     }
 
diff --git a/src/libstd/sync/mpsc/oneshot.rs b/src/libstd/sync/mpsc/oneshot.rs
@@ -89,7 +89,7 @@ enum MyUpgrade<T> {
 }
 
 impl<T> Packet<T> {
-    pub fn new() -> Packet<T> {
+    pub const fn new() -> Packet<T> {
         Packet {
             data: UnsafeCell::new(None),
             upgrade: UnsafeCell::new(NothingSent),
diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs
@@ -517,7 +517,7 @@ impl OnceState {
     ///     assert!(!state.poisoned());
     /// });
     #[unstable(feature = "once_poison", issue = "33577")]
-    pub fn poisoned(&self) -> bool {
+    pub const fn poisoned(&self) -> bool {
         self.poisoned
     }
 }
diff --git a/src/libstd/sys_common/mutex.rs b/src/libstd/sys_common/mutex.rs
@@ -80,7 +80,7 @@ impl Mutex {
 }
 
 // not meant to be exported to the outside world, just the containing module
-pub fn raw(mutex: &Mutex) -> &imp::Mutex { &mutex.0 }
+pub const fn raw(mutex: &Mutex) -> &imp::Mutex { &mutex.0 }
 
 #[must_use]
 /// A simple RAII utility for the above Mutex without the poisoning semantics.
diff --git a/src/libstd/sys_common/net.rs b/src/libstd/sys_common/net.rs
diff --git a/src/libstd/sys_common/wtf8.rs b/src/libstd/sys_common/wtf8.rs
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
diff --git a/src/libstd/time.rs b/src/libstd/time.rs

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ impl<K, V> RawBucket<K, V> {`
`247`	`247`	`// Buckets hold references to the table.`
`248`	`248`	`impl<K, V, M> FullBucket<K, V, M> {`
`249`	`249`	`/// Borrow a reference to the table.`
`250`		`- pub fn table(&self) -> &M {`
	`250`	`+ pub const fn table(&self) -> &M {`
`251`	`251`	`&self.table`
`252`	`252`	`}`
`253`	`253`	`/// Borrow a mutable reference to the table.`
`@@ -259,18 +259,18 @@ impl<K, V, M> FullBucket<K, V, M> {`
`259`	`259`	`self.table`
`260`	`260`	`}`
`261`	`261`	`/// Get the raw index.`
`262`		`- pub fn index(&self) -> usize {`
	`262`	`+ pub const fn index(&self) -> usize {`
`263`	`263`	`self.raw.idx`
`264`	`264`	`}`
`265`	`265`	`/// Get the raw bucket.`
`266`		`- pub fn raw(&self) -> RawBucket<K, V> {`
	`266`	`+ pub const fn raw(&self) -> RawBucket<K, V> {`
`267`	`267`	`self.raw`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`impl<K, V, M> EmptyBucket<K, V, M> {`
`272`	`272`	`/// Borrow a reference to the table.`
`273`		`- pub fn table(&self) -> &M {`
	`273`	`+ pub const fn table(&self) -> &M {`
`274`	`274`	`&self.table`
`275`	`275`	`}`
`276`	`276`	`/// Borrow a mutable reference to the table.`
`@@ -281,7 +281,7 @@ impl<K, V, M> EmptyBucket<K, V, M> {`
`281`	`281`
`282`	`282`	`impl<K, V, M> Bucket<K, V, M> {`
`283`	`283`	`/// Get the raw index.`
`284`		`- pub fn index(&self) -> usize {`
	`284`	`+ pub const fn index(&self) -> usize {`
`285`	`285`	`self.raw.idx`
`286`	`286`	`}`
`287`	`287`	`/// get the table.`
`@@ -772,7 +772,7 @@ impl<K, V> RawTable<K, V> {`
`772`	`772`
`773`	`773`	/// The number of elements ever `put` in the hashtable, minus the number
`774`	`774`	/// of elements ever `take`n.
`775`		`- pub fn size(&self) -> usize {`
	`775`	`+ pub const fn size(&self) -> usize {`
`776`	`776`	`self.size`
`777`	`777`	`}`
`778`	`778`
Original file line number	Diff line number	Diff line change
`@@ -265,12 +265,12 @@ enum FromBytesWithNulErrorKind {`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`impl FromBytesWithNulError {`
`268`		`- fn interior_nul(pos: usize) -> FromBytesWithNulError {`
	`268`	`+ const fn interior_nul(pos: usize) -> FromBytesWithNulError {`
`269`	`269`	`FromBytesWithNulError {`
`270`	`270`	`kind: FromBytesWithNulErrorKind::InteriorNul(pos),`
`271`	`271`	`}`
`272`	`272`	`}`
`273`		`- fn not_nul_terminated() -> FromBytesWithNulError {`
	`273`	`+ const fn not_nul_terminated() -> FromBytesWithNulError {`
`274`	`274`	`FromBytesWithNulError {`
`275`	`275`	`kind: FromBytesWithNulErrorKind::NotNulTerminated,`
`276`	`276`	`}`
`@@ -833,7 +833,7 @@ impl NulError {`
`833`	`833`	`/// assert_eq!(nul_error.nul_position(), 7);`
`834`	`834`	/// ```
`835`	`835`	`#[stable(feature = "rust1", since = "1.0.0")]`
`836`		`- pub fn nul_position(&self) -> usize { self.0 }`
	`836`	`+ pub const fn nul_position(&self) -> usize { self.0 }`
`837`	`837`
`838`	`838`	`/// Consumes this error, returning the underlying vector of bytes which`
`839`	`839`	`/// generated the error in the first place.`
`@@ -909,7 +909,7 @@ impl IntoStringError {`
`909`	`909`
`910`	`910`	`/// Access the underlying UTF-8 error that was the cause of this error.`
`911`	`911`	`#[stable(feature = "cstring_into", since = "1.7.0")]`
`912`		`- pub fn utf8_error(&self) -> Utf8Error {`
	`912`	`+ pub const fn utf8_error(&self) -> Utf8Error {`
`913`	`913`	`self.error`
`914`	`914`	`}`
`915`	`915`	`}`
`@@ -1091,7 +1091,7 @@ impl CStr {`
`1091`	`1091`	/// [`CString`]: struct.CString.html
`1092`	`1092`	`#[inline]`
`1093`	`1093`	`#[stable(feature = "rust1", since = "1.0.0")]`
`1094`		`- pub fn as_ptr(&self) -> *const c_char {`
	`1094`	`+ pub const fn as_ptr(&self) -> *const c_char {`
`1095`	`1095`	`self.inner.as_ptr()`
`1096`	`1096`	`}`
`1097`	`1097`