From 2c76ced9540c1ae541d2f14e9d2c9fe702d4c3e0 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 19 Dec 2014 13:36:27 -0500
Subject: [PATCH] Correct merge failure around imports in `str.rs`.

---
 src/libcore/str.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index 1207c78fa37b..8381deb2bf7d 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};