about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-28 01:12:39 +0000
committerbors <bors@rust-lang.org>2015-07-28 01:12:39 +0000
commit9ca511cf63c3611ffae9218945724c1b32025688 (patch)
tree78e591245c73569b292ba9aba10facbec7252619 /src/liballoc
parent8b835572b9beacbb4c8faea2bf2943ac3a58977b (diff)
parentb3aa1a6d4ac88f68e036a05fdf19be63b522b65d (diff)
downloadrust-9ca511cf63c3611ffae9218945724c1b32025688.tar.gz
rust-9ca511cf63c3611ffae9218945724c1b32025688.zip
Auto merge of #26914 - alexcrichton:deprecate-easy, r=aturon
Many of these have long since reached their stage of being obsolete, so this
commit starts the removal process for all of them. The unstable features that
were deprecated are:

* box_heap
* cmp_partial
* fs_time
* hash_default
* int_slice
* iter_min_max
* iter_reset_fuse
* iter_to_vec
* map_in_place
* move_from
* owned_ascii_ext
* page_size
* read_and_zero
* scan_state
* slice_chars
* slice_position_elem
* subslice_offset
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/boxed.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index acf22094233..05910a3529d 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -86,10 +86,13 @@ use core::raw::{TraitObject};
 #[lang = "exchange_heap"]
 #[unstable(feature = "box_heap",
            reason = "may be renamed; uncertain about custom allocator design")]
+#[allow(deprecated)]
 pub const HEAP: ExchangeHeapSingleton =
     ExchangeHeapSingleton { _force_singleton: () };
 
 /// This the singleton type used solely for `boxed::HEAP`.
+#[unstable(feature = "box_heap",
+           reason = "may be renamed; uncertain about custom allocator design")]
 #[derive(Copy, Clone)]
 pub struct ExchangeHeapSingleton { _force_singleton: () }