diff options
| author | bors <bors@rust-lang.org> | 2015-10-10 00:39:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-10 00:39:29 +0000 |
| commit | 87cd2c08273dec5c8db8e59f4231b8e69aa9b85b (patch) | |
| tree | 24c7c70c06fbcd88be686bcf4e11d5ffc10aa27c /src/libstd | |
| parent | 439311d9382abd5d22c9068f3f158d3b9ef6d1c9 (diff) | |
| parent | a445f234a64cdbbf946af012b94dccf91447b5ff (diff) | |
| download | rust-87cd2c08273dec5c8db8e59f4231b8e69aa9b85b.tar.gz rust-87cd2c08273dec5c8db8e59f4231b8e69aa9b85b.zip | |
Auto merge of #28861 - pnkfelix:fsk-nonparam-dropck-issue28498, r=arielb1
implement RFC 1238: nonparametric dropck. cc #28498 cc @nikomatsakis
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/table.rs | 1 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs index 32541353a0a..e8796dd10b4 100644 --- a/src/libstd/collections/hash/table.rs +++ b/src/libstd/collections/hash/table.rs @@ -999,6 +999,7 @@ impl<K: Clone, V: Clone> Clone for RawTable<K, V> { } impl<K, V> Drop for RawTable<K, V> { + #[unsafe_destructor_blind_to_params] fn drop(&mut self) { if self.capacity == 0 || self.capacity == mem::POST_DROP_USIZE { return; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 10c7190ca0c..9af766ad2af 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -199,6 +199,11 @@ test(no_crate_inject, attr(deny(warnings))), test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))))] +// SNAP 1af31d4 +#![allow(unused_features)] +// SNAP 1af31d4 +#![allow(unused_attributes)] + #![feature(alloc)] #![feature(allow_internal_unstable)] #![feature(associated_consts)] @@ -241,6 +246,7 @@ #![feature(unboxed_closures)] #![feature(unicode)] #![feature(unique)] +#![feature(dropck_parametricity)] #![feature(unsafe_no_drop_flag, filling_drop)] #![feature(decode_utf16)] #![feature(unwind_attributes)] |