Upgrade to rustc 1.39.0-nightly (f7af19c27 2019-08-15)

This commit is contained in:
Simon Sapin 2019-08-16 13:53:01 +02:00
parent 8672ab5447
commit 98e4a53b72
8 changed files with 64 additions and 55 deletions

View file

@ -6384,7 +6384,7 @@ class CGDictionary(CGThing):
d = self.dictionary
if d.parent:
initParent = ("{\n"
" match r#try!(%s::%s::new(cx, val)) {\n"
" match %s::%s::new(cx, val)? {\n"
" ConversionResult::Success(v) => v,\n"
" ConversionResult::Failure(error) => {\n"
" throw_type_error(*cx, &error);\n"
@ -6532,7 +6532,7 @@ class CGDictionary(CGThing):
conversion = (
"{\n"
" rooted!(in(*cx) let mut rval = UndefinedValue());\n"
" if r#try!(get_dictionary_property(*cx, object.handle(), \"%s\", rval.handle_mut()))"
" if get_dictionary_property(*cx, object.handle(), \"%s\", rval.handle_mut())?"
" && !rval.is_undefined() {\n"
"%s\n"
" } else {\n"
@ -7304,7 +7304,7 @@ class CallbackOperationBase(CallbackMethod):
"methodName": self.methodName
}
getCallableFromProp = string.Template(
'r#try!(self.parent.get_callable_property(cx, "${methodName}"))'
'self.parent.get_callable_property(cx, "${methodName}")?'
).substitute(replacements)
if not self.singleOperation:
return 'rooted!(in(*cx) let callable =\n' + getCallableFromProp + ');\n'