From d917112606efb0d1056e91adada7ba3e63641f4f Mon Sep 17 00:00:00 2001
From: Caio <c410.f3r@gmail.com>
Date: Fri, 20 May 2022 11:04:13 -0300
Subject: [PATCH] Stabilize core::array::from_fn
---
library/core/src/array/mod.rs | 12 +++++-------
library/core/tests/array.rs | 2 +-
library/core/tests/lib.rs | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/library/core/src/array/mod.rs b/library/core/src/array/mod.rs
index af661e485f5..fba1a5a751c 100644
--- a/library/core/src/array/mod.rs
+++ b/library/core/src/array/mod.rs
@@ -31,14 +31,12 @@ pub use iter::IntoIter;
/// # Example
///
/// ```rust
-/// #![feature(array_from_fn)]
-///
/// let array = core::array::from_fn(|i| i);
/// assert_eq!(array, [0, 1, 2, 3, 4]);
/// ```
#[inline]
-#[unstable(feature = "array_from_fn", issue = "89379")]
-pub fn from_fn<F, T, const N: usize>(mut cb: F) -> [T; N]
+#[stable(feature = "array_from_fn", since = "1.63.0")]
+pub fn from_fn<T, const N: usize, F>(mut cb: F) -> [T; N]
where
F: FnMut(usize) -> T,
{
@@ -65,7 +63,7 @@ where
/// # Example
///
/// ```rust
-/// #![feature(array_from_fn)]
+/// #![feature(array_try_from_fn)]
///
/// let array: Result<[u8; 5], _> = std::array::try_from_fn(|i| i.try_into());
/// assert_eq!(array, Ok([0, 1, 2, 3, 4]));
@@ -80,8 +78,8 @@ where
/// assert_eq!(array, None);
/// ```
#[inline]
-#[unstable(feature = "array_from_fn", issue = "89379")]
-pub fn try_from_fn<F, R, const N: usize>(cb: F) -> ChangeOutputType<R, [R::Output; N]>
+#[unstable(feature = "array_try_from_fn", issue = "89379")]
+pub fn try_from_fn<R, const N: usize, F>(cb: F) -> ChangeOutputType<R, [R::Output; N]>
where
F: FnMut(usize) -> R,
R: Try,
diff --git a/library/core/tests/array.rs b/library/core/tests/array.rs
index ee7ff012ec1..f268fe3ae7b 100644
--- a/library/core/tests/array.rs
+++ b/library/core/tests/array.rs
@@ -388,7 +388,7 @@ fn array_try_from_fn() {
let array = core::array::try_from_fn(|i| Ok::<_, SomeError>(i));
assert_eq!(array, Ok([0, 1, 2, 3, 4]));
- let another_array = core::array::try_from_fn::<_, Result<(), _>, 2>(|_| Err(SomeError::Foo));
+ let another_array = core::array::try_from_fn::<Result<(), _>, 2, _>(|_| Err(SomeError::Foo));
assert_eq!(another_array, Err(SomeError::Foo));
}
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
index 31b764a6e2d..004589bbc31 100644
--- a/library/core/tests/lib.rs
+++ b/library/core/tests/lib.rs
@@ -35,7 +35,7 @@
#![feature(float_minimum_maximum)]
#![feature(future_join)]
#![feature(future_poll_fn)]
-#![feature(array_from_fn)]
+#![feature(array_try_from_fn)]
#![feature(hasher_prefixfree_extras)]
#![feature(hashmap_internals)]
#![feature(try_find)]