diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-08-13 13:16:14 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-08-13 13:16:14 -0600 |
commit | a03616f379c255cc6c9b6e1d04dd7d98bd9926ce (patch) | |
tree | 0081f3c1bb513706b406a61fba0f73449cbc5ba4 /components/net_traits/storage_task.rs | |
parent | f3b7c5cb4b0fab20db51b7560c3b3bb2d115be69 (diff) | |
parent | 45145108daa6af7e834a7c23530857c504b54b9c (diff) | |
download | servo-a03616f379c255cc6c9b6e1d04dd7d98bd9926ce.tar.gz servo-a03616f379c255cc6c9b6e1d04dd7d98bd9926ce.zip |
Auto merge of #7097 - boghison:memtypes, r=jdm
Measure heap memory usage for more types. Fixes #6951
Also adds HeapSizeOf implementations/derive for some types. I've used "Cannot calculate Heap size" as a reason everywhere, because my imagination is rather limited. If you'd like me to change this message for specific types, please write something like this: "Trusted - Cannot calculate Heap size for Trusted" so that it would be easier for me to replace them through a script :)
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7097)
<!-- Reviewable:end -->
Diffstat (limited to 'components/net_traits/storage_task.rs')
-rw-r--r-- | components/net_traits/storage_task.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/net_traits/storage_task.rs b/components/net_traits/storage_task.rs index 028bd6d1f48..261e6cb1f7b 100644 --- a/components/net_traits/storage_task.rs +++ b/components/net_traits/storage_task.rs @@ -7,7 +7,7 @@ use url::Url; use util::str::DOMString; -#[derive(Copy, Clone, Deserialize, Serialize)] +#[derive(Copy, Clone, Deserialize, Serialize, HeapSizeOf)] pub enum StorageType { Session, Local |