Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make dom_struct derive HeapSizeOf #7361

Merged
merged 1 commit into from Aug 27, 2015
Merged

make dom_struct derive HeapSizeOf #7361

merged 1 commit into from Aug 27, 2015
+3 −226

Conversation

@jxs
Copy link
Contributor

jxs commented Aug 25, 2015

closes #7357

Review on Reviewable
@bors-servo
Copy link
Contributor

bors-servo commented Aug 25, 2015

☔ The latest upstream changes (presumably #6770) made this pull request unmergeable. Please resolve the merge conflicts.
@jxs jxs force-pushed the jxs:master branch 3 times, most recently from d2e001c to 9d0d415 Aug 25, 2015
components/script/dom/treewalker.rs Outdated
@@ -22,8 +22,10 @@ use std::rc::Rc;
pub struct TreeWalker {
reflector_: Reflector,
root_node: JS<Node>,
#[ignore_heap_size_of = "Defined in std"]

This comment has been minimized.

Sign in to view
@Ms2ger

Ms2ger Aug 26, 2015

Contributor

Neither of those are defined in std. lgtm otherwise.
@Ms2ger Ms2ger self-assigned this Aug 26, 2015
@jxs jxs force-pushed the jxs:master branch from 9d0d415 to f21d5f5 Aug 26, 2015
@jxs jxs force-pushed the jxs:master branch from f21d5f5 to 677b844 Aug 26, 2015
components/script/dom/bindings/js.rs
@@ -207,6 +207,7 @@ impl MutHeapJSVal {
/// `JS<T>`.
#[must_root]
#[derive(JSTraceable)]
#[derive(HeapSizeOf)]

This comment has been minimized.

Sign in to view
@jxs

jxs Aug 26, 2015

Author Contributor

added derive for MutHeap
components/script/dom/treewalker.rs
@@ -24,6 +24,7 @@ pub struct TreeWalker {
root_node: JS<Node>,
current_node: MutHeap<JS<Node>>,
what_to_show: u32,
#[ignore_heap_size_of = "function pointers and Rc<T> are hard"]

This comment has been minimized.

Sign in to view
@jxs

jxs Aug 26, 2015

Author Contributor

updated ignore_heap_size description for the Filter enum
@jxs
Copy link
Contributor Author

jxs commented Aug 26, 2015

thanks @Ms2ger, updated with anotations
@jxs
make dom_struct derive HeapSizeOf,
Loading status checks…
fd87c8c 
closes #7357
@jxs jxs force-pushed the jxs:master branch from 677b844 to fd87c8c Aug 27, 2015
@Ms2ger
Copy link
Contributor

Ms2ger commented Aug 27, 2015

Thank you for your PR!

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Aug 27, 2015

📌 Commit fd87c8c has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Aug 27, 2015

⌛ Testing commit fd87c8c with merge 532fd19...
bors-servo pushed a commit that referenced this pull request Aug 27, 2015
bors-servo
Auto merge of #7361 - jxs:master, r=Ms2ger
Loading status checks…
532fd19 
make dom_struct derive HeapSizeOf

closes #7357

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7361)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 27, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2, mac3
@bors-servo bors-servo merged commit fd87c8c into servo:master Aug 27, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ms2ger Ms2ger

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Make dom_struct derive HeapSizeOf
4 participants
@jxs @bors-servo @Ms2ger @highfive
You can’t perform that action at this time.