Remove unused lifetime parameters to dictionaries.

They were used for Root members, but those no longer use lifetimes.
This commit is contained in:
Ms2ger 2015-03-13 14:46:14 +01:00
parent d7e9b8b96b
commit b213a80f80

View file

@ -4362,8 +4362,8 @@ class CGDictionary(CGThing):
def struct(self): def struct(self):
d = self.dictionary d = self.dictionary
if d.parent: if d.parent:
inheritance = " pub parent: %s::%s<'a, 'b>,\n" % (self.makeModuleName(d.parent), inheritance = " pub parent: %s::%s,\n" % (self.makeModuleName(d.parent),
self.makeClassName(d.parent)) self.makeClassName(d.parent))
else: else:
inheritance = "" inheritance = ""
memberDecls = [" pub %s: %s," % memberDecls = [" pub %s: %s," %
@ -4371,7 +4371,7 @@ class CGDictionary(CGThing):
for m in self.memberInfo] for m in self.memberInfo]
return (string.Template( return (string.Template(
"pub struct ${selfName}<'a, 'b> {\n" + "pub struct ${selfName} {\n" +
"${inheritance}" + "${inheritance}" +
"\n".join(memberDecls) + "\n" + "\n".join(memberDecls) + "\n" +
"}").substitute( { "selfName": self.makeClassName(d), "}").substitute( { "selfName": self.makeClassName(d),
@ -4395,11 +4395,11 @@ class CGDictionary(CGThing):
memberInits = CGList([memberInit(m) for m in self.memberInfo]) memberInits = CGList([memberInit(m) for m in self.memberInfo])
return string.Template( return string.Template(
"impl<'a, 'b> ${selfName}<'a, 'b> {\n" "impl ${selfName} {\n"
" pub fn empty() -> ${selfName}<'a, 'b> {\n" " pub fn empty() -> ${selfName} {\n"
" ${selfName}::new(ptr::null_mut(), NullValue()).unwrap()\n" " ${selfName}::new(ptr::null_mut(), NullValue()).unwrap()\n"
" }\n" " }\n"
" pub fn new(cx: *mut JSContext, val: JSVal) -> Result<${selfName}<'a, 'b>, ()> {\n" " pub fn new(cx: *mut JSContext, val: JSVal) -> Result<${selfName}, ()> {\n"
" let object = if val.is_null_or_undefined() {\n" " let object = if val.is_null_or_undefined() {\n"
" ptr::null_mut()\n" " ptr::null_mut()\n"
" } else if val.is_object() {\n" " } else if val.is_object() {\n"