diff options
| author | bors <bors@rust-lang.org> | 2015-07-30 02:41:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-30 02:41:14 +0000 |
| commit | 0bc993c75bb8f40dd446fa65ccafa0d5b70a7a8a (patch) | |
| tree | b3c20ae0099a3ce460176889d379cd36fd79d4a7 /src | |
| parent | 4d52d7c85703fdf41eefb852afac140938cf2a64 (diff) | |
| parent | 2907611025d0a364e96de1a9773a4d94900e8a32 (diff) | |
| download | rust-0bc993c75bb8f40dd446fa65ccafa0d5b70a7a8a.tar.gz rust-0bc993c75bb8f40dd446fa65ccafa0d5b70a7a8a.zip | |
Auto merge of #26734 - Gankro:deprecate-vecmap, r=alexcrichton
VecMap doesn't really fit with the current standard library's strategy (small!). I've mirrored the code to https://github.com/contain-rs/vec-map but @GBGamer has already claimed the name on crates.io a couple months ago for the same purpose. It hasn't been updated since, though. CC @rust-lang/libs
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcollections/lib.rs | 2 | ||||
| -rw-r--r-- | src/libcollections/vec_map.rs | 7 | ||||
| -rw-r--r-- | src/libserialize/collection_impls.rs | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 1f948384992..ee7d2c4d23b 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -87,6 +87,7 @@ pub use enum_set::EnumSet; pub use vec_deque::VecDeque; pub use string::String; pub use vec::Vec; +#[allow(deprecated)] pub use vec_map::VecMap; // Needed for the vec! macro @@ -108,6 +109,7 @@ pub mod str; pub mod string; pub mod vec; pub mod vec_deque; +#[allow(deprecated)] pub mod vec_map; #[unstable(feature = "bitvec", reason = "RFC 509")] diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs index 51fda344c88..a2d378a0faf 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -11,9 +11,12 @@ //! A simple map based on a vector for small integer keys. Space requirements //! are O(highest integer key). +#![deprecated(reason = "VecMap moved to crates.io as vec_map", + since = "1.3.0")] +#![unstable(feature = "vecmap", reason = "deprecated")] +#![allow(deprecated)] + #![allow(missing_docs)] -#![unstable(feature = "vecmap", - reason = "may not be stabilized in the standard library")] use self::Entry::*; diff --git a/src/libserialize/collection_impls.rs b/src/libserialize/collection_impls.rs index e7430f698e9..4b31a606931 100644 --- a/src/libserialize/collection_impls.rs +++ b/src/libserialize/collection_impls.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// VecMap +#![allow(deprecated)] + //! Implementations of serialization for structures found in libcollections use std::usize; |
