about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-01-24 18:25:50 +0100
committerGitHub <noreply@github.com>2019-01-24 18:25:50 +0100
commit7274591df50f135ad725577806471fd42320c532 (patch)
tree4b3ee2c842a1a1aceb5f23b044a06e1cd910db5b /src
parent1a3b3d429873b0f6926a98e4f0a4b78a5230c925 (diff)
parent31cd65f7120e209f7b29b205393156763409547a (diff)
downloadrust-7274591df50f135ad725577806471fd42320c532.tar.gz
rust-7274591df50f135ad725577806471fd42320c532.zip
Rollup merge of #57867 - Aaron1011:fix/gen-future-doc, r=Centril
Fix std::future::from_generator documentation

This function takes a generator and wraps it in a future, not
vice-versa.
Diffstat (limited to 'src')
-rw-r--r--src/libstd/future.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index a7b9895177f..22900c3067b 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -11,7 +11,7 @@ use core::ops::{Drop, Generator, GeneratorState};
 #[doc(inline)]
 pub use core::future::*;
 
-/// Wrap a future in a generator.
+/// Wrap a generator in a future.
 ///
 /// This function returns a `GenFuture` underneath, but hides it in `impl Trait` to give
 /// better error messages (`impl Future` rather than `GenFuture<[closure.....]>`).