diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 11:29:36 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 11:29:36 -0700 |
| commit | 01560112b8dda59d7e45b33d4d344dfdea589ea2 (patch) | |
| tree | 5610d43cfcb6630d7d4af76fb94ebeebacd39993 /src/libcore | |
| parent | e361b25c5e0ae2b49b1850499f0c19683c843fe6 (diff) | |
| download | rust-01560112b8dda59d7e45b33d4d344dfdea589ea2.tar.gz rust-01560112b8dda59d7e45b33d4d344dfdea589ea2.zip | |
Test fixes and rebase conflicts, round 1
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/option.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 368d56f515e..6d9b93e9be0 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -151,7 +151,7 @@ use default::Default; use iter::{ExactSizeIterator}; use iter::{Iterator, IteratorExt, DoubleEndedIterator, FromIterator, IntoIterator}; use mem; -use ops::{Deref, FnOnce}; +use ops::FnOnce; use result::Result::{Ok, Err}; use result::Result; #[allow(deprecated)] |