Skip to content

Commit

Permalink
Rollup merge of rust-lang#57867 - Aaron1011:fix/gen-future-doc, r=Cen…
Browse files Browse the repository at this point in the history
…tril

Fix std::future::from_generator documentation

This function takes a generator and wraps it in a future, not
vice-versa.
  • Loading branch information
Centril committed Jan 24, 2019
2 parents 1a3b3d4 + 31cd65f commit 7274591
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/future.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.....]>`).
Expand Down

0 comments on commit 7274591

Please sign in to comment.