Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix invalid dictionary inheritance #8966

Merged
merged 1 commit into from Dec 14, 2015
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Fix invalid dictionary inheritance

  • Loading branch information
GuillaumeGomez committed Dec 13, 2015
commit 4c99a85c736c54f9ecddbcb1a577309c4be38edf
@@ -1011,7 +1011,8 @@ def wrapObjectTemplate(templateBody, nullValue, isDefinitelyObject, type,
# 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"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.