From db840f52278f073d03c392b611ba7a7f9811e040 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 25 Aug 2017 15:48:03 -0700 Subject: [PATCH] Kill needs_drop --- src/hash/table.rs | 7 ++++--- src/lib.rs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/hash/table.rs b/src/hash/table.rs index f1e8ff66af1..a7439c1aa81 100644 --- a/src/hash/table.rs +++ b/src/hash/table.rs @@ -13,7 +13,7 @@ use alloc::heap::{Heap, Alloc, Layout}; use cmp; use hash::{BuildHasher, Hash, Hasher}; use marker; -use mem::{align_of, size_of, needs_drop}; +use mem::{align_of, size_of}; use mem; use ops::{Deref, DerefMut}; use ptr::{self, Unique, Shared}; @@ -1175,10 +1175,11 @@ unsafe impl<#[may_dangle] K, #[may_dangle] V> Drop for RawTable { // dropping empty tables such as on resize. // Also avoid double drop of elements that have been already moved out. unsafe { - if needs_drop::<(K, V)>() { + // FORK NOTE: Can't needs_drop on stable + // if needs_drop::<(K, V)>() { // avoid linear runtime for types that don't need drop self.rev_drop_buckets(); - } + // } } let hashes_size = self.capacity() * size_of::(); diff --git a/src/lib.rs b/src/lib.rs index 5951e4915a8..2fdcc42ebdc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,7 @@ #![feature(generic_param_attrs)] #![feature(dropck_eyepatch)] #![feature(allocator_api)] -#![feature(alloc, needs_drop, shared, unique, fused, placement_new_protocol)] +#![feature(alloc, shared, unique, fused, placement_new_protocol)] extern crate alloc;