diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2019-08-16 13:53:01 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2019-08-23 08:23:21 +0200 |
| commit | 98e4a53b7241d562d127e0f7005ffb38f21d1380 (patch) | |
| tree | 0cce7af897495931af597959f9d5422995109cef /components/script | |
| parent | 8672ab54471c45351ea7fa71e3d8a095ffcd74f3 (diff) | |
| download | servo-98e4a53b7241d562d127e0f7005ffb38f21d1380.tar.gz servo-98e4a53b7241d562d127e0f7005ffb38f21d1380.zip | |
Upgrade to rustc 1.39.0-nightly (f7af19c27 2019-08-15)
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 6 | ||||
| -rwxr-xr-x | components/script/dom/htmlinputelement.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 93856508e6e..4a8cc573416 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -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' diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index fa389cf9941..cb99d0426ee 100755 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -1640,7 +1640,7 @@ impl Activatable for HTMLInputElement { let owner = self.form_owner(); let doc = document_from_node(self); let doc_node = doc.upcast::<Node>(); - let group = self.radio_group_name();; + let group = self.radio_group_name(); // Safe since we only manipulate the DOM tree after finding an element let checked_member = doc_node |