aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings/proxyhandler.rs
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2014-04-27 18:52:39 -0400
committerbors-servo <release+servo@mozilla.com>2014-04-27 18:52:39 -0400
commit493aa2cdf30fb2ff5886c714030a20d714764b67 (patch)
tree513345ea70f134bf4a85d8e2cdbe166bfee904f6 /src/components/script/dom/bindings/proxyhandler.rs
parent4942cc76bd2c88e5fdc2b4de4c1ac4576100b455 (diff)
parent948daf242278b22d7a15c1c594129785d1cff538 (diff)
downloadservo-493aa2cdf30fb2ff5886c714030a20d714764b67.tar.gz
servo-493aa2cdf30fb2ff5886c714030a20d714764b67.zip
auto merge of #2238 : mozilla/servo/rustup_20140410c, r=Ms2ger
r? @metajack Note that all pending submodule PRs must be landed before this should be given r+.
Diffstat (limited to 'src/components/script/dom/bindings/proxyhandler.rs')
-rw-r--r--src/components/script/dom/bindings/proxyhandler.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/script/dom/bindings/proxyhandler.rs b/src/components/script/dom/bindings/proxyhandler.rs
index 22df6e0df86..1c819a4e568 100644
--- a/src/components/script/dom/bindings/proxyhandler.rs
+++ b/src/components/script/dom/bindings/proxyhandler.rs
@@ -13,8 +13,8 @@ use js::glue::{GetObjectProto, GetObjectParent, SetProxyExtra, GetProxyHandler};
use js::glue::InvokeGetOwnPropertyDescriptor;
use js::{JSPROP_GETTER, JSPROP_ENUMERATE, JSPROP_READONLY, JSRESOLVE_QUALIFIED};
+use libc;
use std::cast;
-use std::libc;
use std::ptr;
use std::str;
use std::mem::size_of;