diff options
| author | bors <bors@rust-lang.org> | 2015-07-29 14:47:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-29 14:47:23 +0000 |
| commit | ddbce1107bc95ea4ad0da6299ca31e313a39e0fc (patch) | |
| tree | 585177068133e497fdca05340ca4642719aba505 /src/libstd/sync/future.rs | |
| parent | ddc28298b9133e6a9cc39e276f9feff51d808949 (diff) | |
| parent | 5944303339fac6f2aa100ae4d2ac5fb72814c4e2 (diff) | |
| download | rust-ddbce1107bc95ea4ad0da6299ca31e313a39e0fc.tar.gz rust-ddbce1107bc95ea4ad0da6299ca31e313a39e0fc.zip | |
Auto merge of #27380 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #27102, #27286, #27313, #27325, #27326, #27327, #27341, #27342, #27343, #27345, #27350, #27355, #27374, #27375, #27379 - Failed merges:
Diffstat (limited to 'src/libstd/sync/future.rs')
| -rw-r--r-- | src/libstd/sync/future.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sync/future.rs b/src/libstd/sync/future.rs index 28dc124f033..b87a2756829 100644 --- a/src/libstd/sync/future.rs +++ b/src/libstd/sync/future.rs @@ -14,7 +14,8 @@ //! # Examples //! //! ``` -//! # #![feature(future)] +//! #![feature(future)] +//! //! use std::sync::Future; //! //! // a fake, for now |