@@ -272,12 +272,12 @@ mod _csv {
272272 let Some ( name) = name. payload_if_subclass :: < PyStr > ( vm) else {
273273 return Err ( vm. new_type_error ( "argument 0 must be a string" . to_string ( ) ) ) ;
274274 } ;
275- let mut dialect = match dialect {
275+ let dialect = match dialect {
276276 OptionalArg :: Present ( d) => PyDialect :: try_from_object ( vm, d)
277277 . map_err ( |_| vm. new_type_error ( "argument 1 must be a dialect object" . to_owned ( ) ) ) ?,
278278 OptionalArg :: Missing => opts. result ( vm) ?,
279279 } ;
280- opts. update_pydialect ( & mut dialect) ;
280+ let dialect = opts. update_pydialect ( dialect) ;
281281 GLOBAL_HASHMAP
282282 . lock ( )
283283 . insert ( name. as_str ( ) . to_owned ( ) , dialect) ;
@@ -665,7 +665,7 @@ mod _csv {
665665 }
666666
667667 impl FormatOptions {
668- fn update_pydialect < ' b > ( & self , res : & ' b mut PyDialect ) -> & ' b mut PyDialect {
668+ fn update_pydialect ( & self , mut res : PyDialect ) -> PyDialect {
669669 macro_rules! check_and_fill {
670670 ( $res: ident, $e: ident) => { {
671671 if let Some ( t) = self . $e {
@@ -699,24 +699,18 @@ mod _csv {
699699 DialectItem :: Str ( name) => {
700700 let g = GLOBAL_HASHMAP . lock ( ) ;
701701 if let Some ( dialect) = g. get ( name) {
702- let mut dialect = * dialect;
703- self . update_pydialect ( & mut dialect) ;
704- Ok ( dialect)
702+ Ok ( self . update_pydialect ( * dialect) )
705703 } else {
706704 Err ( new_csv_error ( vm, format ! ( "{} is not registed." , name) ) )
707705 }
708706 // TODO
709707 // Maybe need to update the obj from HashMap
710708 }
711- DialectItem :: Obj ( mut o) => {
712- self . update_pydialect ( & mut o) ;
713- Ok ( o)
714- }
709+ DialectItem :: Obj ( o) => Ok ( self . update_pydialect ( * o) ) ,
715710 DialectItem :: None => {
716711 let g = GLOBAL_HASHMAP . lock ( ) ;
717- let mut res = * g. get ( "excel" ) . unwrap ( ) ;
718- self . update_pydialect ( & mut res) ;
719- Ok ( res)
712+ let res = * g. get ( "excel" ) . unwrap ( ) ;
713+ Ok ( self . update_pydialect ( res) )
720714 }
721715 }
722716 }
0 commit comments