@@ -274,8 +274,7 @@ fn gen_hash_impl(adt: &ast::Adt, func: &ast::Fn) -> Option<()> {
274
274
let method = make:: name_ref ( "hash" ) ;
275
275
let arg = make:: expr_path ( make:: ext:: ident_path ( "state" ) ) ;
276
276
let expr = make:: expr_method_call ( target, method, make:: arg_list ( Some ( arg) ) ) ;
277
- let stmt = make:: expr_stmt ( expr) ;
278
- stmt. into ( )
277
+ make:: expr_stmt ( expr) . into ( )
279
278
}
280
279
281
280
let body = match adt {
@@ -335,8 +334,7 @@ fn gen_partial_eq(adt: &ast::Adt, func: &ast::Fn) -> Option<()> {
335
334
let submodule = make:: ext:: ident_path ( "mem" ) ;
336
335
let fn_name = make:: ext:: ident_path ( "discriminant" ) ;
337
336
let fn_name = make:: path_concat ( submodule, fn_name) ;
338
- let fn_name = make:: expr_path ( make:: path_concat ( root, fn_name) ) ;
339
- fn_name
337
+ make:: expr_path ( make:: path_concat ( root, fn_name) )
340
338
}
341
339
342
340
fn gen_eq_chain ( expr : Option < ast:: Expr > , cmp : ast:: Expr ) -> Option < ast:: Expr > {
@@ -349,15 +347,11 @@ fn gen_partial_eq(adt: &ast::Adt, func: &ast::Fn) -> Option<()> {
349
347
fn gen_record_pat_field ( field_name : & str , pat_name : & str ) -> ast:: RecordPatField {
350
348
let pat = make:: ext:: simple_ident_pat ( make:: name ( & pat_name) ) ;
351
349
let name_ref = make:: name_ref ( field_name) ;
352
- let field = make:: record_pat_field ( name_ref, pat. into ( ) ) ;
353
- field
350
+ make:: record_pat_field ( name_ref, pat. into ( ) )
354
351
}
355
352
356
- fn gen_record_pat (
357
- record_name : ast:: Path ,
358
- r_fields : Vec < ast:: RecordPatField > ,
359
- ) -> ast:: RecordPat {
360
- let list = make:: record_pat_field_list ( r_fields) ;
353
+ fn gen_record_pat ( record_name : ast:: Path , fields : Vec < ast:: RecordPatField > ) -> ast:: RecordPat {
354
+ let list = make:: record_pat_field_list ( fields) ;
361
355
make:: record_pat_with_fields ( record_name, list)
362
356
}
363
357
@@ -371,6 +365,7 @@ fn gen_partial_eq(adt: &ast::Adt, func: &ast::Fn) -> Option<()> {
371
365
fn gen_tuple_field ( field_name : & String ) -> ast:: Pat {
372
366
ast:: Pat :: IdentPat ( make:: ident_pat ( false , false , make:: name ( field_name) ) )
373
367
}
368
+
374
369
// FIXME: return `None` if the trait carries a generic type; we can only
375
370
// generate this code `Self` for the time being.
376
371
0 commit comments