diff options
| author | bors <bors@rust-lang.org> | 2014-03-20 09:51:44 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-20 09:51:44 -0700 |
| commit | b568efc0cf173ac7b2d37284beda5fdf8a7686ab (patch) | |
| tree | 415a907e4fe835d78e4bfb2e3581010a33eed192 /src/libstd | |
| parent | c01e2f05a3ef27e464d1f0057ddabcde6ffde70c (diff) | |
| parent | da3625161d8f8bcb2f43d703eec8d002d0bb9c87 (diff) | |
| download | rust-b568efc0cf173ac7b2d37284beda5fdf8a7686ab.tar.gz rust-b568efc0cf173ac7b2d37284beda5fdf8a7686ab.zip | |
auto merge of #13020 : alexcrichton/rust/vec, r=brson
The commits have the details.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/prelude.rs | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 0431a80d0c4..583510a7e80 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -65,7 +65,6 @@ #[deny(non_camel_case_types)]; #[deny(missing_doc)]; #[allow(unknown_features)]; -#[allow(deprecated_owned_vector)]; // When testing libstd, bring in libuv as the I/O backend so tests can print // things and all of the std::io tests have an I/O interface to run on top diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index f3a5bd3d3b5..f8e56cf8a2f 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -59,6 +59,7 @@ pub use slice::{ImmutableEqVector, ImmutableTotalOrdVector, ImmutableCloneableVe pub use slice::{OwnedVector, OwnedCloneableVector, OwnedEqVector}; pub use slice::{MutableVector, MutableTotalOrdVector}; pub use slice::{Vector, VectorVector, CloneableVector, ImmutableVector}; +pub use vec::Vec; // Reexported runtime types pub use comm::{channel, Sender, Receiver}; |
