diff options
author | bors-servo <release+servo@mozilla.com> | 2014-05-30 13:16:09 -0400 |
---|---|---|
committer | bors-servo <release+servo@mozilla.com> | 2014-05-30 13:16:09 -0400 |
commit | da896b8299620ad31bcdc84d931ecdcb3efd6979 (patch) | |
tree | 69befa39099f9e3f40d894847464a4f12ca854b2 /src/components/script/layout_interface.rs | |
parent | 39e3c64ead997b3a8c6be6e188aad27fcbe3220b (diff) | |
parent | 106627e6eb1bba39216cfc88dffe2b6f0f4b95e4 (diff) | |
download | servo-da896b8299620ad31bcdc84d931ecdcb3efd6979.tar.gz servo-da896b8299620ad31bcdc84d931ecdcb3efd6979.zip |
auto merge of #2515 : saneyuki/servo/raw, r=jdm
Fix #2511
@jdm r?
Diffstat (limited to 'src/components/script/layout_interface.rs')
-rw-r--r-- | src/components/script/layout_interface.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/script/layout_interface.rs b/src/components/script/layout_interface.rs index c7f8d4f7a80..4b69efea010 100644 --- a/src/components/script/layout_interface.rs +++ b/src/components/script/layout_interface.rs @@ -70,7 +70,7 @@ pub struct TrustedNodeAddress(pub *c_void); impl<S: Encoder<E>, E> Encodable<S, E> for TrustedNodeAddress { fn encode(&self, s: &mut S) -> Result<(), E> { let TrustedNodeAddress(addr) = *self; - let node = addr as *Node as *mut Node; + let node = addr as *Node; unsafe { JS::from_raw(node).encode(s) } |