Auto merge of #69482 - lqd:poloniusup, r=nikomatsakis

[rust.git] / src / libstd / future.rs

diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index f74c84e6dfd4862f60362a73aeb756b7cd7539ab..7b1beb1ecda80089bc6df13eceebb3ae39c99b5d 100644 (file)
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -16,9 +16,10 @@
 ///
 /// This function returns a `GenFuture` underneath, but hides it in `impl Trait` to give
 /// better error messages (`impl Future` rather than `GenFuture<[closure.....]>`).
+// This is `const` to avoid extra errors after we recover from `const async fn`
 #[doc(hidden)]
 #[unstable(feature = "gen_future", issue = "50547")]
-pub fn from_generator<T: Generator<Yield = ()>>(x: T) -> impl Future<Output = T::Return> {
+pub const fn from_generator<T: Generator<Yield = ()>>(x: T) -> impl Future<Output = T::Return> {
     GenFuture(x)
 }