diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2014-12-19 13:36:27 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2014-12-22 12:27:08 -0500 |
| commit | 2c76ced9540c1ae541d2f14e9d2c9fe702d4c3e0 (patch) | |
| tree | e4aa60288474c7069d46c025fcc900f81fb58c0c /src/libcore | |
| parent | 2e2906522d4a6160621725a6c58c751d3aab36cc (diff) | |
| download | rust-2c76ced9540c1ae541d2f14e9d2c9fe702d4c3e0.tar.gz rust-2c76ced9540c1ae541d2f14e9d2c9fe702d4c3e0.zip | |
Correct merge failure around imports in `str.rs`.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/str.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libcore/str.rs b/src/libcore/str.rs index 1207c78fa37..8381deb2bf7 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -30,10 +30,9 @@ use iter::range; use kinds::Sized; use mem; use num::Int; -use ops::FnMut; +use ops::{Fn, FnMut}; use option::Option; use option::Option::{None, Some}; -use ops::{Fn, FnMut}; use ptr::RawPtr; use raw::{Repr, Slice}; use slice::{mod, SliceExt}; |