diff options
| author | bors <bors@rust-lang.org> | 2014-02-10 14:56:47 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-10 14:56:47 -0800 |
| commit | 38ed4674e8054ee854871303401bffed7c05b01b (patch) | |
| tree | 59745ee9aa34079821e8afa2274a4bc83e98254d /src/libsync/future.rs | |
| parent | cf9164f94c6a7e3717f67b1fb74a7662639835f0 (diff) | |
| parent | e9ff91e9beb6c92d9662242c1090c507b1611c59 (diff) | |
auto merge of #11956 : edwardw/rust/issue-7556, r=cmr
Closes #7556. Also move ``std::util::Void`` to ``std::any::Void``. It makes more sense to me.
Diffstat (limited to 'src/libsync/future.rs')
| -rw-r--r-- | src/libsync/future.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsync/future.rs b/src/libsync/future.rs index 479174d17af..9984d2dd0ad 100644 --- a/src/libsync/future.rs +++ b/src/libsync/future.rs @@ -26,7 +26,7 @@ #[allow(missing_doc)]; -use std::util::replace; +use std::mem::replace; /// A type encapsulating the result of a computation which may not be complete pub struct Future<A> { |