From 3cf4ef61efce446d46634eecfee0383296d5a7b5 Mon Sep 17 00:00:00 2001 From: Mukilan Thiyagarajan Date: Thu, 27 Feb 2025 12:34:11 +0530 Subject: bindings: Fix support for interface members in setlike/maplike. (#35651) #30151 added support for setlike and maplike declarations in WebIDL, but the tests only validated if generator code worked with 'DOMString' as the key type. The support for interface type as members was broken as `DomRoot` didn't satify the bounds `Eq` and `Hash` needed by the `Key` and `Value` types in `Setlike` and `Maplike` traits respectively. In addition, the splitting of bindings into a separate 'script_bindings' crate had also broken support for this in CodegenRust.py, as the types used within the definition of `DomTraits` were not referenced using `Self::`. This patch fixes the WebIDL code generator by doing a simple string replacement on the return value of `getRetvalDeclarationForType` so that the proper `Self::` is used. I'm not not sure if there is a better approach to this as it seems most logic in CodegenRust.py uses the `D::` prefix that is expected to be available only when compiling `script` crate and not `script_bindings`. This patch also adds the missing trait implementations for `DomRoot` and ensures that the generated code works for both members of primitive and interface types by splitting the existing `TestBinding{Map,Set}Like` interfaces into `TestBinding{Map,Set}LikeWith{Primitive,Interface}` tests. Fixes #35542. Signed-off-by: Mukilan Thiyagarajan --- components/script_bindings/root.rs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'components/script_bindings/root.rs') diff --git a/components/script_bindings/root.rs b/components/script_bindings/root.rs index c18c30cfae7..c573e163882 100644 --- a/components/script_bindings/root.rs +++ b/components/script_bindings/root.rs @@ -351,6 +351,14 @@ where } } +impl Eq for DomRoot {} + +impl Hash for DomRoot { + fn hash(&self, state: &mut H) { + self.value.hash(state); + } +} + impl Clone for DomRoot where T: DomObject, -- cgit v1.2.3