about summary refs log tree commit diff
path: root/src/libstd/path
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-08 21:06:37 +0000
committerbors <bors@rust-lang.org>2014-11-08 21:06:37 +0000
commitf0ca717c643cbef31859e443ee20db4465ac8864 (patch)
tree05190af84acccdfc795368a8e2431ab3f43038b5 /src/libstd/path
parentb80edf1d1257bf521fd9e62b732b6302258374e7 (diff)
parenta11f16739f08ec480263ba549d510fffc8ce557e (diff)
downloadrust-f0ca717c643cbef31859e443ee20db4465ac8864.tar.gz
rust-f0ca717c643cbef31859e443ee20db4465ac8864.zip
auto merge of #18475 : gamazeps/rust/toExtend, r=alexcrichton
Ensured that Extend & FromIterator are implemented for the libcollection.

Removed the fact that FromIterator had to be implemented in order to implement Extend, as it did not make sense for LruCache (it needs to be given a size and there are no Default for LruCache).

Changed the name from Extend to Extendable.

Part of #18424 
Diffstat (limited to 'src/libstd/path')
-rw-r--r--src/libstd/path/posix.rs2
-rw-r--r--src/libstd/path/windows.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs
index a927e091840..9918e939097 100644
--- a/src/libstd/path/posix.rs
+++ b/src/libstd/path/posix.rs
@@ -16,7 +16,7 @@ use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering};
 use from_str::FromStr;
 use hash;
 use io::Writer;
-use iter::{DoubleEndedIterator, AdditiveIterator, Extendable, Iterator, Map};
+use iter::{DoubleEndedIterator, AdditiveIterator, Extend, Iterator, Map};
 use option::{Option, None, Some};
 use str::Str;
 use str;
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index c5f84244928..3a5350f0a29 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -19,7 +19,7 @@ use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering};
 use from_str::FromStr;
 use hash;
 use io::Writer;
-use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Iterator, Map};
+use iter::{AdditiveIterator, DoubleEndedIterator, Extend, Iterator, Map};
 use mem;
 use option::{Option, Some, None};
 use slice::{AsSlice, SlicePrelude};