aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-01-29 17:15:12 +0100
committerMs2ger <ms2ger@gmail.com>2015-01-29 17:28:06 +0100
commit6920aa970d0ff85afd148902a93a9252e4099797 (patch)
treec565e4b35733cc23598ac29d817aedc2092a0662 /components
parentd7de6973c7ed07b6b163a7dab582bf49e09223b0 (diff)
downloadservo-6920aa970d0ff85afd148902a93a9252e4099797.tar.gz
servo-6920aa970d0ff85afd148902a93a9252e4099797.zip
Rename delete_ to delete.
Diffstat (limited to 'components')
-rw-r--r--components/script/dom/bindings/codegen/CodegenRust.py6
-rw-r--r--components/script/dom/bindings/proxyhandler.rs4
2 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index db06ad603fb..997ff7b7d50 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2092,7 +2092,7 @@ class CGDefineProxyHandler(CGAbstractMethod):
if self.descriptor.operations['IndexedSetter'] or self.descriptor.operations['NamedSetter']:
customDefineProperty = 'defineProperty'
- customDelete = 'delete_'
+ customDelete = 'proxyhandler::delete'
if self.descriptor.operations['NamedDeleter']:
customDelete = 'delete'
@@ -3785,7 +3785,7 @@ class CGDOMJSProxyHandler_delete(CGAbstractExternMethod):
"let this = JS::from_raw(this);\n" +
"let this = this.root();\n" +
"%s") % (CGProxyNamedDeleter(self.descriptor).define())
- set += "return proxyhandler::delete_(%s);" % ", ".join(a.name for a in self.args)
+ set += "return proxyhandler::delete(%s);" % ", ".join(a.name for a in self.args)
return set
def definition_body(self):
@@ -4582,7 +4582,7 @@ class CGBindingRoot(CGThing):
'dom::bindings::proxyhandler',
'dom::bindings::proxyhandler::{_obj_toString}',
'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}',
- 'dom::bindings::proxyhandler::{delete_, get_property_descriptor}',
+ 'dom::bindings::proxyhandler::{get_property_descriptor}',
'dom::bindings::proxyhandler::{getOwnPropertyNames_, enumerate_}',
'dom::bindings::str::ByteString',
'page::JSPageInfo',
diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs
index 186e2ef3591..4f03b6127fe 100644
--- a/components/script/dom/bindings/proxyhandler.rs
+++ b/components/script/dom/bindings/proxyhandler.rs
@@ -77,8 +77,8 @@ pub unsafe extern fn define_property(cx: *mut JSContext, proxy: *mut JSObject,
}
/// Deletes an expando off the given `proxy`.
-pub unsafe extern fn delete_(cx: *mut JSContext, proxy: *mut JSObject, id: jsid,
- bp: *mut bool) -> bool {
+pub unsafe extern fn delete(cx: *mut JSContext, proxy: *mut JSObject, id: jsid,
+ bp: *mut bool) -> bool {
let expando = GetExpandoObject(proxy);
if expando.is_null() {
*bp = true;