Put Vec in with the rest of the collections

src/libstd/collections/mod.rs

@@ -419,6 +419,8 @@ pub use core_collections::{LinkedList, VecDeque};
 pub use core_collections::{binary_heap, btree_map, btree_set};
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core_collections::{linked_list, vec_deque};
+#[stable(feature = "rust1", since = "1.0.0")]
+pub use core_collections::vec::{self, Vec};
 
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::hash_map::HashMap;

src/libstd/lib.rs

@@ -135,8 +135,8 @@
 //! atomically-reference-counted box, [`Arc`], with a [`Mutex`] to get the same
 //! effect.
 //!
-//! The [`collections`] module defines maps, sets, linked lists and other
-//! typical collection types, including the common [`HashMap<K, V>`].
+//! The [`collections`] module defines maps, sets, sequences and other typical
+//! collection types, including the common [`Vec<T>`] and [`HashMap<K, V>`].
 //!
 //! ## Platform abstractions and I/O
 //!
@@ -169,7 +169,7 @@
 //! [`RefCell`]: cell/struct.RefCell.html
 //! [`Result<T, E>`]: result/enum.Result.html
 //! [`String`]: string/struct.String.html
-//! [`Vec<T>`]: vec/index.html
+//! [`Vec<T>`]: collections/vec/index.html
 //! [array]: primitive.array.html
 //! [slice]: primitive.slice.html
 //! [`atomic`]: sync/atomic/index.html
@@ -367,8 +367,14 @@ pub use core_collections::slice;
 pub use core_collections::str;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core_collections::string;
+#[rustc_deprecated(since = "1.12.0")]
 #[stable(feature = "rust1", since = "1.0.0")]
-pub use core_collections::vec;
+pub mod vec {
+    //! `Vec<T>` used to be in its own module, separate from the rest of the
+    //! collections. This re-export is included for backwards compatibility.
+    #[stable(feature = "rust1", since = "1.0.0")]
+    pub use core_collections::vec::*;
+}
 
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use rustc_unicode::char;

src/test/compile-fail/fn-item-type.rs

@@ -33,8 +33,8 @@ fn main() {
     eq(bar::<String>, bar::<Vec<u8>>);
     //~^ ERROR mismatched types
     //~|  expected type `fn(isize) -> isize {bar::<std::string::String>}`
-    //~|  found type `fn(isize) -> isize {bar::<std::vec::Vec<u8>>}`
-    //~|  expected struct `std::string::String`, found struct `std::vec::Vec`
+    //~|  found type `fn(isize) -> isize {bar::<std::collections::Vec<u8>>}`
+    //~|  expected struct `std::string::String`, found struct `std::collections::Vec`
 
     // Make sure we distinguish between trait methods correctly.
     eq(<u8 as Foo>::foo, <u16 as Foo>::foo);

src/test/compile-fail/issue-24819.rs

@@ -14,7 +14,7 @@ fn main() {
     let mut v = Vec::new();
     foo(&mut v);
     //~^ ERROR mismatched types
-    //~| expected struct `std::collections::HashSet`, found struct `std::vec::Vec`
+    //~| expected struct `std::collections::HashSet`, found struct `std::collections::Vec`
 }
 
 fn foo(h: &mut HashSet<u32>) {

src/test/compile-fail/on-unimplemented/on-trait.rs

@@ -33,7 +33,7 @@ pub fn main() {
     let x = vec!(1u8, 2, 3, 4);
     let y: Option<Vec<u8>> = collect(x.iter()); // this should give approximately the same error for x.iter().collect()
     //~^ ERROR
-    //~^^ NOTE a collection of type `std::option::Option<std::vec::Vec<u8>>` cannot be built from an iterator over elements of type `&u8`
+    //~^^ NOTE a collection of type `std::option::Option<std::collections::Vec<u8>>` cannot be built from an iterator over elements of type `&u8`
     //~^^^ NOTE required by `collect`
     let x: String = foobar(); //~ ERROR
     //~^ NOTE test error `std::string::String` with `u8` `_` `u32`