@@ -46,8 +46,7 @@ impl<'a> CodeGenerator<'a> {
4646 let mut external_qualified_names = HashMap :: new ( ) ;
4747 for ( namespace, names) in & config. external_definitions {
4848 for name in names {
49- external_qualified_names
50- . insert ( name. to_string ( ) , format ! ( "{}::{}" , namespace, name) ) ;
49+ external_qualified_names. insert ( name. to_string ( ) , format ! ( "{namespace}::{name}" ) ) ;
5150 }
5251 }
5352 Self {
@@ -157,7 +156,7 @@ where
157156 path. push ( name. to_string ( ) ) ;
158157 if let Some ( doc) = self . generator . config . comments . get ( & path) {
159158 let text = textwrap:: indent ( doc, "/// " ) . replace ( "\n \n " , "\n ///\n " ) ;
160- write ! ( self . out, "{}" , text ) ?;
159+ write ! ( self . out, "{text}" ) ?;
161160 }
162161 Ok ( ( ) )
163162 }
@@ -169,7 +168,7 @@ where
169168 . custom_code
170169 . get ( & self . current_namespace )
171170 {
172- write ! ( self . out, "\n {}" , code ) ?;
171+ write ! ( self . out, "\n {code}" ) ?;
173172 }
174173 Ok ( ( ) )
175174 }
@@ -191,7 +190,7 @@ where
191190 if require_known_size && !self . known_sizes . contains ( x. as_str ( ) ) {
192191 // Cannot use unique_ptr because we need a copy constructor (e.g. for vectors)
193192 // and in-depth equality.
194- format ! ( "serde::value_ptr<{}>" , qname )
193+ format ! ( "serde::value_ptr<{qname }>" )
195194 } else {
196195 qname
197196 }
@@ -253,7 +252,7 @@ where
253252 ) -> Result < ( ) > {
254253 writeln ! ( self . out) ?;
255254 self . output_comment ( name) ?;
256- writeln ! ( self . out, "struct {} {{" , name ) ?;
255+ writeln ! ( self . out, "struct {name } {{" ) ?;
257256 self . enter_class ( name) ;
258257 for field in fields {
259258 self . output_comment ( & field. name ) ?;
@@ -292,7 +291,7 @@ where
292291 }
293292
294293 fn output_container_forward_definition ( & mut self , name : & str ) -> Result < ( ) > {
295- writeln ! ( self . out, "\n struct {};" , name )
294+ writeln ! ( self . out, "\n struct {name };" )
296295 }
297296
298297 fn output_enum_container (
@@ -302,7 +301,7 @@ where
302301 ) -> Result < ( ) > {
303302 writeln ! ( self . out) ?;
304303 self . output_comment ( name) ?;
305- writeln ! ( self . out, "struct {} {{" , name ) ?;
304+ writeln ! ( self . out, "struct {name } {{" ) ?;
306305 self . enter_class ( name) ;
307306 for ( expected_index, ( index, variant) ) in variants. iter ( ) . enumerate ( ) {
308307 assert_eq ! ( * index, expected_index as u32 ) ;
@@ -312,8 +311,8 @@ where
312311 self . out,
313312 "\n std::variant<{}> value;" ,
314313 variants
315- . iter ( )
316- . map( |( _ , v ) | v. name. clone( ) )
314+ . values ( )
315+ . map( |v | v. name. clone( ) )
317316 . collect:: <Vec <_>>( )
318317 . join( ", " ) ,
319318 ) ?;
@@ -327,8 +326,7 @@ where
327326 fn output_class_method_declarations ( & mut self , name : & str ) -> Result < ( ) > {
328327 writeln ! (
329328 self . out,
330- "friend bool operator==(const {}&, const {}&);" ,
331- name, name
329+ "friend bool operator==(const {name}&, const {name}&);"
332330 ) ?;
333331 if self . generator . config . serialization {
334332 for encoding in & self . generator . config . encodings {
@@ -372,15 +370,13 @@ where
372370 fn output_struct_equality_test ( & mut self , name : & str , fields : & [ & str ] ) -> Result < ( ) > {
373371 writeln ! (
374372 self . out,
375- "\n inline bool operator==(const {0} &lhs, const {0} &rhs) {{" ,
376- name,
373+ "\n inline bool operator==(const {name} &lhs, const {name} &rhs) {{" ,
377374 ) ?;
378375 self . out . indent ( ) ;
379376 for field in fields {
380377 writeln ! (
381378 self . out,
382- "if (!(lhs.{0} == rhs.{0})) {{ return false; }}" ,
383- field,
379+ "if (!(lhs.{field} == rhs.{field})) {{ return false; }}" ,
384380 ) ?;
385381 }
386382 writeln ! ( self . out, "return true;" ) ?;
@@ -443,8 +439,7 @@ inline {} {}::{}Deserialize(std::vector<uint8_t> input) {{
443439 r#"
444440template <>
445441template <typename Serializer>
446- void serde::Serializable<{0}>::serialize(const {0} &obj, Serializer &serializer) {{"# ,
447- name,
442+ void serde::Serializable<{name}>::serialize(const {name} &obj, Serializer &serializer) {{"# ,
448443 ) ?;
449444 self . out . indent ( ) ;
450445 if is_container {
@@ -453,8 +448,7 @@ void serde::Serializable<{0}>::serialize(const {0} &obj, Serializer &serializer)
453448 for field in fields {
454449 writeln ! (
455450 self . out,
456- "serde::Serializable<decltype(obj.{0})>::serialize(obj.{0}, serializer);" ,
457- field,
451+ "serde::Serializable<decltype(obj.{field})>::serialize(obj.{field}, serializer);" ,
458452 ) ?;
459453 }
460454 if is_container {
@@ -475,19 +469,17 @@ void serde::Serializable<{0}>::serialize(const {0} &obj, Serializer &serializer)
475469 r#"
476470template <>
477471template <typename Deserializer>
478- {0} serde::Deserializable<{0}>::deserialize(Deserializer &deserializer) {{"# ,
479- name,
472+ {name} serde::Deserializable<{name}>::deserialize(Deserializer &deserializer) {{"# ,
480473 ) ?;
481474 self . out . indent ( ) ;
482475 if is_container {
483476 writeln ! ( self . out, "deserializer.increase_container_depth();" ) ?;
484477 }
485- writeln ! ( self . out, "{} obj;" , name ) ?;
478+ writeln ! ( self . out, "{name } obj;" ) ?;
486479 for field in fields {
487480 writeln ! (
488481 self . out,
489- "obj.{0} = serde::Deserializable<decltype(obj.{0})>::deserialize(deserializer);" ,
490- field,
482+ "obj.{field} = serde::Deserializable<decltype(obj.{field})>::deserialize(deserializer);" ,
491483 ) ?;
492484 }
493485 if is_container {
0 commit comments