bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #20410: japaric/assoc-types

Browse source 
Conflicts:
	src/liballoc/lib.rs
	src/libcollections/lib.rs
	src/libcollections/slice.rs
	src/libcore/ops.rs
	src/libcore/prelude.rs
	src/libcore/ptr.rs
	src/librustc/middle/traits/project.rs
	src/libstd/c_str.rs
	src/libstd/io/mem.rs
	src/libstd/io/mod.rs
	src/libstd/lib.rs
	src/libstd/path/posix.rs
	src/libstd/path/windows.rs
	src/libstd/prelude.rs
	src/libstd/rt/exclusive.rs
	src/libsyntax/lib.rs
	src/test/compile-fail/issue-18566.rs
	src/test/run-pass/deref-mut-on-ref.rs
	src/test/run-pass/deref-on-ref.rs
	src/test/run-pass/dst-deref-mut.rs
	src/test/run-pass/dst-deref.rs
	src/test/run-pass/fixup-deref-mut.rs
	src/test/run-pass/issue-13264.rs
	src/test/run-pass/overloaded-autoderef-indexing.rs
This commit is contained in:
Alex Crichton 2015-01-02 12:16:41 -08:00
commit 340f3fd7a9
74 changed files with 947 additions and 637 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstd/path/mod.rs
View file

@ -71,8 +71,7 @@ use option::Option::{None, Some};
use str;
use str::{CowString, MaybeOwned, Str, StrExt};
use string::String;
use slice::{AsSlice, CloneSliceExt};
use slice::{PartialEqSliceExt, SliceExt};
use slice::{AsSlice, SliceExt};
use vec::Vec;
/// Typedef for POSIX file paths.

5
src/libstd/path/posix.rs
View file

@ -22,8 +22,7 @@ use option::Option::{None, Some};
use kinds::Sized;
use str::{FromStr, Str};
use str;
use slice::{CloneSliceExt, Split, AsSlice, SliceConcatExt,
PartialEqSliceExt, SliceExt};
use slice::{Split, AsSlice, SliceConcatExt, SliceExt};
use vec::Vec;
use super::{BytesContainer, GenericPath, GenericPathUnsafe};
@ -453,7 +452,7 @@ mod tests {
use iter::{IteratorExt, DoubleEndedIteratorExt};
use option::Option::{mod, Some, None};
use path::GenericPath;
use slice::{AsSlice, SliceExt, CloneSliceExt};
use slice::{AsSlice, SliceExt};
use str::{mod, Str, StrExt};
use string::ToString;
use vec::Vec;

2
src/libstd/path/windows.rs
View file

@ -1127,7 +1127,7 @@ mod tests {
use iter::{IteratorExt, DoubleEndedIteratorExt};
use option::Option::{mod, Some, None};
use path::GenericPath;
use slice::{AsSlice, SliceExt, CloneSliceExt};
use slice::{AsSlice, SliceExt};
use str::Str;
use string::ToString;
use vec::Vec;