Add Allocative

Reviewed By: ndmitchell

Differential Revision: D41036062

fbshipit-source-id: ac8060f04a9ce0c39616c928711de0991c424018

Author: stepancheg

starlark_map/Cargo.toml

@@ -17,6 +17,9 @@ gazebo.features = ["str_pattern_extensions"]
 gazebo_lint.version = "0.1"
 gazebo_lint.optional = true
 # @oss-disable: gazebo_lint.path = "../../gazebo_lint/gazebo_lint"
+allocative.version = "0.2"
+# @oss-disable: allocative.path = "../../allocative/allocative"
+allocative.features = ["hashbrown"]
 
 fnv = "1.0.7"
 hashbrown = { version = "0.12.3", features = ["raw"] }

starlark_map/src/hash_value.rs

@@ -18,13 +18,14 @@
 use std::fmt::Debug;
 use std::hash::Hash;
 
+use allocative::Allocative;
 use gazebo::dupe::Dupe;
 
 use crate::hasher::StarlarkHasher;
 use crate::mix_u32::mix_u32;
 
 /// A hash value.
-#[derive(Clone, Copy, Dupe, PartialEq, Eq, Hash, Debug)]
+#[derive(Clone, Copy, Dupe, PartialEq, Eq, Hash, Debug, Allocative)]
 pub struct StarlarkHashValue(u32);
 
 impl StarlarkHashValue {

starlark_map/src/hashed.rs

@@ -21,13 +21,14 @@ use std::hash::Hash;
 use std::hash::Hasher;
 use std::ops::Deref;
 
+use allocative::Allocative;
 use gazebo::prelude::Dupe;
 
 use crate::equivalent::Equivalent;
 use crate::hash_value::StarlarkHashValue;
 
 /// A key and its hash.
-#[derive(PartialEq, Eq, Debug, Clone, Copy, Dupe)]
+#[derive(PartialEq, Eq, Debug, Clone, Copy, Dupe, Allocative)]
 pub struct Hashed<K> {
     hash: StarlarkHashValue,
     key: K,

starlark_map/src/small_map/mod.rs

@@ -26,6 +26,7 @@ use std::hash::Hash;
 use std::hash::Hasher;
 use std::mem;
 
+use allocative::Allocative;
 use gazebo::coerce::Coerce;
 use gazebo::coerce::CoerceKey;
 use gazebo::prelude::*;
@@ -58,7 +59,7 @@ const NO_INDEX_THRESHOLD: usize = 12;
 ///
 /// * Functions which work with the position, e.g. [`get_index_of`](SmallMap::get_index_of).
 #[repr(C)]
-#[derive(Clone, Default_)]
+#[derive(Clone, Default_, Allocative)]
 pub struct SmallMap<K, V> {
     entries: VecMap<K, V>,
     /// Map a key to the index in `entries`.

starlark_map/src/small_set/mod.rs

@@ -22,6 +22,7 @@ use std::fmt::Debug;
 use std::hash::Hash;
 use std::hash::Hasher;
 
+use allocative::Allocative;
 use gazebo::prelude::*;
 
 use crate::equivalent::Equivalent;
@@ -31,7 +32,7 @@ pub use crate::small_set::iter::IntoIter;
 pub use crate::small_set::iter::Iter;
 
 /// An memory-efficient set with determinstic order, based on [`SmallMap`].
-#[derive(Clone, Default_)]
+#[derive(Clone, Default_, Allocative)]
 pub struct SmallSet<T>(SmallMap<T, ()>);
 
 impl<T: Debug> Debug for SmallSet<T> {

starlark_map/src/vec_map/mod.rs

@@ -21,6 +21,7 @@ use std::hash::Hash;
 use std::hash::Hasher;
 use std::mem;
 
+use allocative::Allocative;
 use gazebo::prelude::*;
 
 use crate::equivalent::Equivalent;
@@ -36,7 +37,7 @@ pub(crate) use crate::vec_map::iter::Values;
 pub(crate) use crate::vec_map::iter::ValuesMut;
 
 /// Bucket in [`VecMap`].
-#[derive(Debug, Clone, Eq, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq, Allocative)]
 pub(crate) struct Bucket<K, V> {
     hash: StarlarkHashValue,
     key: K,
@@ -53,7 +54,7 @@ impl<K: Hash, V: Hash> Hash for Bucket<K, V> {
     }
 }
 
-#[derive(Debug, Clone, Eq, PartialEq, Default_)]
+#[derive(Debug, Clone, Eq, PartialEq, Default_, Allocative)]
 pub(crate) struct VecMap<K, V> {
     buckets: Vec<Bucket<K, V>>,
 }