@@ -75,16 +75,16 @@ fn text(n: &swc_xml::ast::Text) -> Option<JSXElementChild> {
7575 static ref SPACE_REGEX : Regex = Regex :: new( r"^\s+$" ) . unwrap( ) ;
7676 }
7777
78- let value = n. data . to_string ( ) ;
79- if SPACE_REGEX . is_match ( & value) {
78+ let value = n. data . as_str ( ) ;
79+ if SPACE_REGEX . is_match ( value) {
8080 return None ;
8181 }
8282
8383 Some ( JSXElementChild :: JSXExprContainer ( JSXExprContainer {
8484 span : DUMMY_SP ,
8585 expr : JSXExpr :: Expr ( Box :: new ( Expr :: Lit ( Lit :: Str ( Str {
8686 span : DUMMY_SP ,
87- value : decode_xml ( & value) . into ( ) ,
87+ value : decode_xml ( value) . into ( ) ,
8888 raw : None ,
8989 } ) ) ) ) ,
9090 } ) )
@@ -112,7 +112,7 @@ impl HastVisitor {
112112 . attributes
113113 . iter ( )
114114 . map ( |attr| {
115- let value = attr. value . clone ( ) . map ( |v| get_value ( & attr. name , & v) ) ;
115+ let value = attr. value . as_ref ( ) . map ( |v| get_value ( & attr. name , v) ) ;
116116 JSXAttrOrSpread :: JSXAttr ( JSXAttr {
117117 span : DUMMY_SP ,
118118 name : JSXAttrName :: Ident ( self . get_key ( & attr. name , & n. tag_name ) . into ( ) ) ,
@@ -128,23 +128,23 @@ impl HastVisitor {
128128 ) ) ;
129129 let children = self . all ( & n. children ) ;
130130
131- let opening = JSXOpeningElement {
132- span : DUMMY_SP ,
133- name : name. clone ( ) ,
134- attrs,
135- self_closing : children. is_empty ( ) ,
136- type_args : None ,
137- } ;
138-
139131 let closing = if !children. is_empty ( ) {
140132 Some ( JSXClosingElement {
141133 span : DUMMY_SP ,
142- name,
134+ name : name . clone ( ) ,
143135 } )
144136 } else {
145137 None
146138 } ;
147139
140+ let opening = JSXOpeningElement {
141+ span : DUMMY_SP ,
142+ name : name,
143+ attrs,
144+ self_closing : children. is_empty ( ) ,
145+ type_args : None ,
146+ } ;
147+
148148 JSXElement {
149149 span : DUMMY_SP ,
150150 opening,
0 commit comments