File tree Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -3831,6 +3831,7 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
3831
3831
} else {
3832
3832
self . upcast :: < Node > ( )
3833
3833
. xml_serialize ( XmlChildrenOnly ( Some ( qname) ) )
3834
+ . map_err ( |_| Error :: InvalidState ) ?
3834
3835
} ;
3835
3836
3836
3837
Ok ( TrustedHTMLOrNullIsEmptyString :: NullIsEmptyString ( result) )
@@ -3888,7 +3889,9 @@ impl ElementMethods<crate::DomTypeHolder> for Element {
3888
3889
self . upcast :: < Node > ( )
3889
3890
. html_serialize ( IncludeNode , false , vec ! [ ] , can_gc)
3890
3891
} else {
3891
- self . upcast :: < Node > ( ) . xml_serialize ( XmlIncludeNode )
3892
+ self . upcast :: < Node > ( )
3893
+ . xml_serialize ( XmlIncludeNode )
3894
+ . map_err ( |_| Error :: InvalidState ) ?
3892
3895
} ;
3893
3896
3894
3897
Ok ( TrustedHTMLOrNullIsEmptyString :: NullIsEmptyString ( result) )
Original file line number Diff line number Diff line change @@ -3150,17 +3150,17 @@ impl Node {
3150
3150
pub ( crate ) fn xml_serialize (
3151
3151
& self ,
3152
3152
traversal_scope : xml_serialize:: TraversalScope ,
3153
- ) -> DOMString {
3153
+ ) -> Result < DOMString , ( ) > {
3154
3154
let mut writer = vec ! [ ] ;
3155
3155
xml_serialize:: serialize (
3156
3156
& mut writer,
3157
3157
& self ,
3158
3158
xml_serialize:: SerializeOpts { traversal_scope } ,
3159
3159
)
3160
- . expect ( "Cannot serialize node" ) ;
3160
+ . map_err ( |_| ( ) ) ? ;
3161
3161
3162
3162
// FIXME(ajeffrey): Directly convert UTF8 to DOMString
3163
- DOMString :: from ( String :: from_utf8 ( writer) . unwrap ( ) )
3163
+ Ok ( DOMString :: from ( String :: from_utf8 ( writer) . unwrap ( ) ) )
3164
3164
}
3165
3165
3166
3166
/// <https://html.spec.whatwg.org/multipage/#fragment-serializing-algorithm-steps>
@@ -3187,6 +3187,7 @@ impl Node {
3187
3187
// TODO: xml5ever doesn't seem to want require_well_formed
3188
3188
let _ = require_well_formed;
3189
3189
self . xml_serialize ( xml_serialize:: TraversalScope :: ChildrenOnly ( None ) )
3190
+ . unwrap ( )
3190
3191
}
3191
3192
}
3192
3193
You can’t perform that action at this time.
0 commit comments