diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-14 17:08:23 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-14 17:08:23 +0530 |
| commit | 201b5c98202fc6fbdd7478c650199777e5eb9dd8 (patch) | |
| tree | 6b18218e376f32ce43151a9f698b6228ac617f0d /components | |
| parent | 1d7f296fb8263490ebbcdac371f671ef15a36665 (diff) | |
| parent | 4c99a85c736c54f9ecddbcb1a577309c4be38edf (diff) | |
| download | servo-201b5c98202fc6fbdd7478c650199777e5eb9dd8.tar.gz servo-201b5c98202fc6fbdd7478c650199777e5eb9dd8.zip | |
Auto merge of #8966 - GuillaumeGomez:patch-1, r=nox
Fix invalid dictionary inheritance
Needed by #8882.
cc @nox
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8966)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index f947b0b2f80..1e8033c7347 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -1011,7 +1011,8 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, # There are no nullable dictionaries assert not type.nullable() - typeName = CGDictionary.makeDictionaryName(type.inner) + typeName = "%s::%s" % (CGDictionary.makeModuleName(type.inner), + CGDictionary.makeDictionaryName(type.inner)) declType = CGGeneric(typeName) template = ("match %s::new(cx, ${val}) {\n" " Ok(dictionary) => dictionary,\n" |