user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct merge failure around imports in str.rs.

Browse source
This commit is contained in:
Niko Matsakis 2014-12-19 13:36:27 -05:00
parent 2e2906522d
commit 2c76ced954
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libcore/str.rs
View file

@ -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};