Skip to content
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

Jump to bottom

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

Conversation

jxs
Copy link
Contributor

@jxs jxs commented Aug 25, 2015

closes #7357

Review on Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 25, 2015
@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #6770) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added S-needs-rebase There are merge conflict errors. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Aug 25, 2015
@jxs jxs force-pushed the master branch 3 times, most recently from d2e001c to 9d0d415 Compare August 26, 2015 02:15
Ms2ger
Ms2ger reviewed Aug 26, 2015
View reviewed changes
components/script/dom/treewalker.rs
@@ -22,8 +22,10 @@ use std::rc::Rc;
pub struct TreeWalker {
reflector_: Reflector,
root_node: JS<Node>,
#[ignore_heap_size_of = "Defined in std"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neither of those are defined in std. lgtm otherwise.

@Ms2ger Ms2ger added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Aug 26, 2015
@Ms2ger Ms2ger self-assigned this Aug 26, 2015
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Aug 26, 2015
jxs
jxs reviewed Aug 26, 2015
View reviewed changes
components/script/dom/bindings/js.rs
@@ -207,6 +207,7 @@ impl MutHeapJSVal {
/// `JS<T>`.
#[must_root]
#[derive(JSTraceable)]
#[derive(HeapSizeOf)]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added derive for MutHeap

@jxs
Copy link
Contributor Author

jxs commented Aug 26, 2015

thanks @Ms2ger, updated with anotations

@Ms2ger
Copy link
Contributor

Ms2ger commented Aug 27, 2015

Thank you for your PR!

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit fd87c8c has been approved by Ms2ger

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Aug 27, 2015
@bors-servo
Copy link
Contributor

⌛ Testing commit fd87c8c with merge 532fd19...

bors-servo pushed a commit that referenced this pull request Aug 27, 2015
Auto merge of #7361 - jxs:master, r=Ms2ger
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

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2, mac3

@bors-servo bors-servo merged commit fd87c8c into servo:master Aug 27, 2015
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 The PR is in the process of compiling and running tests on the automated CI.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Make dom_struct derive HeapSizeOf
4 participants
@jxs @bors-servo @Ms2ger @highfive