Merge pull request scala#5638 from som-snytt/issue/10137

SI-10137 Correct Queue.enqueue(collection.Iterable)

Author: SethTisue

src/library/scala/collection/immutable/Queue.scala

@@ -113,16 +113,14 @@ sealed class Queue[+A] protected(protected val in: List[A], protected val out: L
    */
   def enqueue[B >: A](elem: B) = new Queue(elem :: in, out)
 
-  /** Returns a new queue with all elements provided by an `Iterable` object
-   *  added at the end of the queue.
+  /** Creates a new queue with all elements provided by an `Iterable` object
+   *  added at the end of the old queue.
    *
-   *  The elements are prepended in the order they are given out by the
-   *  iterator.
+   *  The elements are prepended in the order they are given out by the iterator.
    *
    *  @param  iter        an iterable object
    */
-  def enqueue[B >: A](iter: Iterable[B]) =
-    new Queue(iter.toList reverse_::: in, out)
+  def enqueue[B >: A](iter: scala.collection.Iterable[B]) = new Queue(iter.toList reverse_::: in, out)
 
   /** Returns a tuple with the first element in the queue,
    *  and a new queue with this element removed.

test/files/run/iq.check

@@ -6,6 +6,7 @@ qc: Queue(42, 0)
 Head: 42
 q5: Queue(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
 q5[5]: 5
+q5alt: Queue(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
 q5 == q5c: true
 q5c == q5: true
 q8: Queue(2, 3, 4, 5, 6, 7, 8, 9, 10, 11)

test/files/run/iq.scala

@@ -16,7 +16,7 @@ object iq {
       Console.println("Empty")
     }
 
-    /* Test enqueing. */
+    /* Test enqueueing. */
     val q2 = q.enqueue(42).enqueue(0)
     val qa = q :+ 42 :+ 0
     assert(q2 == qa)
@@ -45,7 +45,7 @@ object iq {
         q3
       }
 
-    /* Test sequence enqueing. */
+    /* Test sequence enqueueing. */
     val q5: Queue[Any] = q4.enqueue(List(1,2,3,4,5,6,7,8,9))
     /* Test toString.
      * Expected: q5: Queue(0,1,2,3,4,5,6,7,8,9)
@@ -56,6 +56,10 @@ object iq {
      */
     Console.println("q5[5]: " + q5(5))
 
+    val q5alt: Queue[Any] = q4.enqueue(collection.Iterable(1,2,3,4,5,6,7,8,9))
+    Console.println("q5alt: " + q5alt)
+    assert(q5alt.sameElements(q5))
+
     val q5c: Queue[Int] = Queue.empty.enqueue(List(0, 1, 2, 3, 4, 5, 6, 7, 8, 9))
 
     /* Testing ==