diff options
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 8 | ||||
-rw-r--r-- | components/script/dom/domparser.rs | 3 | ||||
-rw-r--r-- | components/script/dom/permissionstatus.rs | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index e4448ff834c..b184cce76b2 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -3992,12 +3992,18 @@ pub const strings: &'static [&'static str] = &[ %s, ]; +impl super::%s { + pub fn as_str(&self) -> &'static str { + strings[*self as usize] + } +} + impl ToJSValConvertible for super::%s { unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { strings[*self as usize].to_jsval(cx, rval); } } -""" % (",\n ".join(['"%s"' % val for val in enum.values()]), enum.identifier.name) +""" % (",\n ".join(['"%s"' % val for val in enum.values()]), enum.identifier.name, enum.identifier.name) self.cgRoot = CGList([ CGGeneric(decl), diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index 32b5c5343a1..d89ec3c1595 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -53,8 +53,7 @@ impl DOMParserMethods for DOMParser { ty: DOMParserBinding::SupportedType) -> Fallible<Root<Document>> { let url = self.window.get_url(); - let content_type = - DOMString::from(DOMParserBinding::SupportedTypeValues::strings[ty as usize]); + let content_type = DOMString::from(ty.as_str()); let doc = self.window.Document(); let loader = DocumentLoader::new(&*doc.loader()); match ty { diff --git a/components/script/dom/permissionstatus.rs b/components/script/dom/permissionstatus.rs index 0d060aa8e84..339d8228eca 100644 --- a/components/script/dom/permissionstatus.rs +++ b/components/script/dom/permissionstatus.rs @@ -4,7 +4,7 @@ use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::PermissionStatusBinding::{self, PermissionDescriptor, PermissionName}; -use dom::bindings::codegen::Bindings::PermissionStatusBinding::{PermissionNameValues, PermissionState}; +use dom::bindings::codegen::Bindings::PermissionStatusBinding::PermissionState; use dom::bindings::codegen::Bindings::PermissionStatusBinding::PermissionStatusMethods; use dom::bindings::js::Root; use dom::bindings::reflector::reflect_dom_object; @@ -57,6 +57,6 @@ impl PermissionStatusMethods for PermissionStatus { impl Display for PermissionName { fn fmt(&self, f: &mut Formatter) -> fmt::Result { - write!(f, "{}", PermissionNameValues::strings[*self as usize].to_string()) + write!(f, "{}", self.as_str()) } } |