about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJubilee <workingjubilee@gmail.com>2024-09-09 00:17:50 -0700
committerGitHub <noreply@github.com>2024-09-09 00:17:50 -0700
commit38520aed189fb7d62555b80e6213f41bccd4a3cd (patch)
tree7e28819fd932851052029a33d760067e037f6ac8
parent09373b997de09d43dc76c328c3f8941374bb9065 (diff)
parentf7d4da65c7df37c316d9e2793dff1ae6c994c44d (diff)
downloadrust-38520aed189fb7d62555b80e6213f41bccd4a3cd.tar.gz
rust-38520aed189fb7d62555b80e6213f41bccd4a3cd.zip
Rollup merge of #130087 - RalfJung:option-const-iter, r=workingjubilee
remove 'const' from 'Option::iter'

This is kind of pointless to be a `const fn` since you can't do anything with the iterator. It is also the only `const fn iter*` in the entire standard library. It probably got constified when `~const` traits got added everywhere, and then was forgotten to be de-constified when that was undone.

The rest of the const_option feature seems like it can reasonably be stabilized, but this one IMO should not be stabilized, and it's not worth creating a new tracking issue.

Cc https://github.com/rust-lang/rust/issues/67441
-rw-r--r--library/core/src/option.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/library/core/src/option.rs b/library/core/src/option.rs
index 212e4f02154..56787615e28 100644
--- a/library/core/src/option.rs
+++ b/library/core/src/option.rs
@@ -1338,9 +1338,8 @@ impl<T> Option<T> {
     /// assert_eq!(x.iter().next(), None);
     /// ```
     #[inline]
-    #[rustc_const_unstable(feature = "const_option", issue = "67441")]
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub const fn iter(&self) -> Iter<'_, T> {
+    pub fn iter(&self) -> Iter<'_, T> {
         Iter { inner: Item { opt: self.as_ref() } }
     }