diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-06 18:31:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-06 18:31:46 -0800 |
| commit | 32c121b6ff4a3f9336e742ecf1a96b187986fde0 (patch) | |
| tree | 678963322c292d39a286a78f299def638d6c2c17 /components/script/dom/servoparser/html.rs | |
| parent | b54cfc9f259e72ea26e68ec8a7b1d617cf0812d3 (diff) | |
| parent | 535765907d667466636e0fcaa9a7c6a078cf397d (diff) | |
| download | servo-32c121b6ff4a3f9336e742ecf1a96b187986fde0.tar.gz servo-32c121b6ff4a3f9336e742ecf1a96b187986fde0.zip | |
Auto merge of #14473 - nox:raf-safety, r=Ms2ger
Clean up JSTraceable and how we use it
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14473)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/servoparser/html.rs')
| -rw-r--r-- | components/script/dom/servoparser/html.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs index 0f806171a9b..ac6330c3ca2 100644 --- a/components/script/dom/servoparser/html.rs +++ b/components/script/dom/servoparser/html.rs @@ -96,8 +96,9 @@ impl Tokenizer { } } -impl JSTraceable for HtmlTokenizer<TreeBuilder<JS<Node>, Sink>> { - fn trace(&self, trc: *mut JSTracer) { +#[allow(unsafe_code)] +unsafe impl JSTraceable for HtmlTokenizer<TreeBuilder<JS<Node>, Sink>> { + unsafe fn trace(&self, trc: *mut JSTracer) { struct Tracer(*mut JSTracer); let tracer = Tracer(trc); @@ -105,7 +106,7 @@ impl JSTraceable for HtmlTokenizer<TreeBuilder<JS<Node>, Sink>> { type Handle = JS<Node>; #[allow(unrooted_must_root)] fn trace_handle(&self, node: &JS<Node>) { - node.trace(self.0); + unsafe { node.trace(self.0); } } } |