about summary refs log tree commit diff
path: root/src/libcollections/priority_queue.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-31 00:51:35 -0700
committerbors <bors@rust-lang.org>2014-03-31 00:51:35 -0700
commitabb616209d23f0883f4e96253c4233c29741fc7d (patch)
treeb860d566ba0c30adf456121deb4b807daa4dfaba /src/libcollections/priority_queue.rs
parent6281299230aca568723463897ed7448c9b51c4a7 (diff)
parentee052198c51599c987a6d2e9601eaaba21316c52 (diff)
downloadrust-abb616209d23f0883f4e96253c4233c29741fc7d.tar.gz
rust-abb616209d23f0883f4e96253c4233c29741fc7d.zip
auto merge of #13220 : brson/rust/from_iter, r=thestinger
Diffstat (limited to 'src/libcollections/priority_queue.rs')
-rw-r--r--src/libcollections/priority_queue.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcollections/priority_queue.rs b/src/libcollections/priority_queue.rs
index 3d2f260d380..78bc72e77e2 100644
--- a/src/libcollections/priority_queue.rs
+++ b/src/libcollections/priority_queue.rs
@@ -193,7 +193,7 @@ impl<'a, T> Iterator<&'a T> for Items<'a, T> {
 }
 
 impl<T: Ord> FromIterator<T> for PriorityQueue<T> {
-    fn from_iterator<Iter: Iterator<T>>(iter: Iter) -> PriorityQueue<T> {
+    fn from_iter<Iter: Iterator<T>>(iter: Iter) -> PriorityQueue<T> {
         let mut q = PriorityQueue::new();
         q.extend(iter);
         q