-
Notifications
You must be signed in to change notification settings - Fork 117
Added RootKind and GCMethods implementation for PropertyDescriptor #414
Conversation
src/rust.rs
Outdated
@@ -304,6 +304,11 @@ impl RootKind for Value { | |||
fn rootKind() -> jsapi::RootKind { jsapi::RootKind::Value } | |||
} | |||
|
|||
impl RootKind for PropertyDescriptor { | |||
#[inline(always)] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: indentation.
impl GCMethods for PropertyDescriptor { | ||
unsafe fn initial() -> PropertyDescriptor { PropertyDescriptor::default() } | ||
unsafe fn post_barrier(_ : *mut PropertyDescriptor, _ : PropertyDescriptor, _ :PropertyDescriptor) {} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: add a newline after this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Cargo.toml
Outdated
@@ -2,7 +2,7 @@ | |||
name = "mozjs" | |||
description = "Rust bindings to the Mozilla SpiderMonkey JavaScript engine." | |||
repository = "https://github.com/servo/rust-mozjs" | |||
version = "0.5.0" | |||
version = "0.6.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be 0.5.1.
fb073ab
to
18ea0f8
Compare
@bors-servo r+ |
📌 Commit 18ea0f8 has been approved by |
☔ The latest upstream changes (presumably #393) made this pull request unmergeable. Please resolve the merge conflicts. |
🔒 Merge conflict |
Why this stiil isn't merged 2 hours after passing tests and approval? |
I didn't think there was any particular rush, since there's still debugging happening for the test failures, right? I've been too hasty merging other PRs like the handle one while the Servo PR isn't ready yet. |
No there is no particular rush.I was just surprised and thought there is a problem on my side. |
@taki-jaro Could you rebase your commits against the master branch instead of merging? Once you've done that, you can instruct bors-servo to r=jdm. @bors-servo delegate+ |
✌️ @taki-jaro can now approve this pull request |
5fb61e7
to
3e5024a
Compare
@bors-servo r=jdm |
📌 Commit 3e5024a has been approved by |
Added RootKind and GCMethods implementation for PropertyDescriptor It is needed for [servo issue 15012](servo/servo#15012). <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-mozjs/414) <!-- Reviewable:end -->
💔 Test failed - status-travis |
@taki-jaro No need for a new commit; you can just |
📌 Commit 1bff572 has been approved by `jdm`` |
Added RootKind and GCMethods implementation for PropertyDescriptor It is needed for [servo issue 15012](servo/servo#15012). <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-mozjs/414) <!-- Reviewable:end -->
@bors-servo r- |
☀️ Test successful - status-appveyor, status-travis |
1bff572
to
3e5024a
Compare
@KiChjang Ok, thanks |
@bors-servo retry |
@bors-servo retry |
@KiChjang It doesn't seem to work I still have failed test from 22 hours ago, the 2 retry command I gave didin't restart the test |
@taki-jaro When you push a new commit, the r+ state in homu is reset, which forces you to do another r+. So if I do @bors-servo r=jdm right now, it would Just Work. |
📌 Commit 3e5024a has been approved by |
💡 This pull request was already approved, no need to approve it again. |
📌 Commit 3e5024a has been approved by |
Added RootKind and GCMethods implementation for PropertyDescriptor It is needed for [servo issue 15012](servo/servo#15012). <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-mozjs/414) <!-- Reviewable:end -->
☀️ Test successful - status-appveyor, status-travis |
It is needed for servo issue 15012.
This change is