File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ copy_iterator = "warn"
9191default_trait_access = " warn"
9292doc_link_with_quotes = " warn"
9393doc_markdown = " warn"
94- empty_enum = " warn"
94+ empty_enums = " warn"
9595enum_glob_use = " warn"
9696expl_impl_clone_on_copy = " warn"
9797explicit_deref_methods = " warn"
@@ -173,7 +173,7 @@ struct_field_names = "warn"
173173too_many_lines = " allow" # FIXME 14 triggers for this lint; probably most should be fixed
174174transmute_ptr_to_ptr = " warn"
175175trivially_copy_pass_by_ref = " warn"
176- unchecked_duration_subtraction = " warn"
176+ unchecked_time_subtraction = " warn"
177177unicode_not_nfc = " warn"
178178unnecessary_box_returns = " warn"
179179unnecessary_join = " warn"
Original file line number Diff line number Diff line change @@ -360,11 +360,11 @@ impl PartiallySignedTransaction {
360360
361361 self . global . merge ( other. global ) ?;
362362
363- for ( self_input, other_input) in self . inputs . iter_mut ( ) . zip ( other. inputs . into_iter ( ) ) {
363+ for ( self_input, other_input) in self . inputs . iter_mut ( ) . zip ( other. inputs ) {
364364 self_input. merge ( other_input) ?;
365365 }
366366
367- for ( self_output, other_output) in self . outputs . iter_mut ( ) . zip ( other. outputs . into_iter ( ) ) {
367+ for ( self_output, other_output) in self . outputs . iter_mut ( ) . zip ( other. outputs ) {
368368 self_output. merge ( other_output) ?;
369369 }
370370
Original file line number Diff line number Diff line change @@ -186,10 +186,8 @@ impl Deserialize for KeySource {
186186
187187 let mut d = & bytes[ 4 ..] ;
188188 while !d. is_empty ( ) {
189- match u32:: consensus_decode ( & mut d) {
190- Ok ( index) => dpath. push ( index. into ( ) ) ,
191- Err ( e) => return Err ( e) ,
192- }
189+ let index = u32:: consensus_decode ( & mut d) ?;
190+ dpath. push ( index. into ( ) ) ;
193191 }
194192
195193 Ok ( ( fprint, dpath. into ( ) ) )
You can’t perform that action at this time.
0 commit comments