@@ -684,8 +684,8 @@ impl From<Vec<String>> for Lines {
684
684
}
685
685
}
686
686
687
- impl std :: fmt:: Display for Lines {
688
- fn fmt ( & self , f : & mut std :: fmt:: Formatter < ' _ > ) -> fmt:: Result {
687
+ impl fmt:: Display for Lines {
688
+ fn fmt ( & self , f : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
689
689
for line in self . lines . iter ( ) {
690
690
write ! ( f, "\n {:width$}{line}" , "" , width = self . indent) ?;
691
691
}
@@ -1182,11 +1182,7 @@ fn type_to_ext(t: &str, v: bool, r: bool, pi8: bool) -> String {
1182
1182
let native = type_to_native_type ( t) ;
1183
1183
let sub_ext = match type_sub_len ( t) {
1184
1184
1 => String :: new ( ) ,
1185
- _ if v => format ! (
1186
- ".p0v{}{}" ,
1187
- & type_len( & type_to_sub_type( t) ) . to_string( ) ,
1188
- native
1189
- ) ,
1185
+ _ if v => format ! ( ".p0v{}{native}" , type_len( & type_to_sub_type( t) ) ) ,
1190
1186
_ if pi8 => ".p0i8" . to_string ( ) ,
1191
1187
_ => format ! ( ".p0{native}" ) ,
1192
1188
} ;
@@ -1195,12 +1191,7 @@ fn type_to_ext(t: &str, v: bool, r: bool, pi8: bool) -> String {
1195
1191
"u" => native. replace ( 'u' , "i" ) ,
1196
1192
_ => panic ! ( "unknown type: {t}" ) ,
1197
1193
} ;
1198
- let ext = format ! (
1199
- "v{}{}{}" ,
1200
- & type_len( & type_to_sub_type( t) ) . to_string( ) ,
1201
- sub_type,
1202
- sub_ext
1203
- ) ;
1194
+ let ext = format ! ( "v{}{sub_type}{sub_ext}" , type_len( & type_to_sub_type( t) ) ) ;
1204
1195
if r {
1205
1196
let ss: Vec < _ > = ext. split ( '.' ) . collect ( ) ;
1206
1197
if ss. len ( ) != 2 {
@@ -2800,7 +2791,7 @@ fn get_call(
2800
2791
if i != 0 || j != 0 {
2801
2792
s. push_str ( ", " ) ;
2802
2793
}
2803
- s. push_str ( & format ! ( "{base_len} * {} as u32" , & fn_format[ 2 ] ) ) ;
2794
+ s. push_str ( & format ! ( "{base_len} * {} as u32" , fn_format[ 2 ] ) ) ;
2804
2795
if j != 0 {
2805
2796
s. push_str ( & format ! ( " + {j}" ) ) ;
2806
2797
}
@@ -2816,7 +2807,7 @@ fn get_call(
2816
2807
"in_ttn" => type_to_native_type ( in_t[ 1 ] ) ,
2817
2808
_ => String :: new ( ) ,
2818
2809
} ;
2819
- return format ! ( "{} as {t}" , & fn_format[ 1 ] ) ;
2810
+ return format ! ( "{} as {t}" , fn_format[ 1 ] ) ;
2820
2811
}
2821
2812
if fn_name. starts_with ( "ins" ) {
2822
2813
let fn_format: Vec < _ > = fn_name. split ( '-' ) . map ( |v| v. to_string ( ) ) . collect ( ) ;
@@ -2861,11 +2852,11 @@ fn get_call(
2861
2852
"in2_dot" => type_exp_len ( in_t[ 2 ] , 4 ) ,
2862
2853
_ => 0 ,
2863
2854
} ;
2864
- if len == 0 {
2865
- return format ! ( r#"static_assert!({} == 0);"# , fn_format[ 2 ] ) ;
2855
+ return if len == 0 {
2856
+ format ! ( r#"static_assert!({} == 0);"# , fn_format[ 2 ] )
2866
2857
} else {
2867
- return format ! ( r#"static_assert_uimm_bits!({}, {len});"# , fn_format[ 2 ] ) ;
2868
- }
2858
+ format ! ( r#"static_assert_uimm_bits!({}, {len});"# , fn_format[ 2 ] )
2859
+ } ;
2869
2860
}
2870
2861
if fn_name. starts_with ( "static_assert" ) {
2871
2862
let fn_format: Vec < _ > = fn_name. split ( '-' ) . map ( |v| v. to_string ( ) ) . collect ( ) ;
@@ -3175,22 +3166,19 @@ fn get_call(
3175
3166
} else {
3176
3167
String :: from ( & types[ 1 ] )
3177
3168
} ;
3178
- fn_name. push_str ( & format ! ( "::<{}, {}>" , & type1 , & type2 ) ) ;
3169
+ fn_name. push_str ( & format ! ( "::<{type1 }, {type2 }>" ) ) ;
3179
3170
} else {
3180
3171
fn_name. push_str ( & fn_format[ 2 ] ) ;
3181
3172
}
3182
3173
}
3183
3174
if param_str. is_empty ( ) {
3184
3175
fn_name. replace ( "out_t" , out_t)
3185
3176
} else if let Some ( ( re_name, re_type) ) = re. clone ( ) {
3186
- format ! (
3187
- r#"let {}: {} = {}({});"# ,
3188
- re_name, re_type, fn_name, param_str
3189
- )
3177
+ format ! ( "let {re_name}: {re_type} = {fn_name}({param_str});" )
3190
3178
} else if fn_name. starts_with ( '*' ) {
3191
- format ! ( r# "{fn_name} = {param_str};"# )
3179
+ format ! ( "{fn_name} = {param_str};" )
3192
3180
} else {
3193
- format ! ( r# "{fn_name}({param_str})"# )
3181
+ format ! ( "{fn_name}({param_str})" )
3194
3182
}
3195
3183
}
3196
3184
0 commit comments