@@ -124,45 +124,11 @@ impl FtMessageParser {
124124 /// * 3 DLT_RAW(bytes)
125125 /// * 4 DLT_STRING("FLDA")
126126 fn data_message ( timestamp : Option < u32 > , args : & [ Argument ] ) -> Option < FtMessage < ' _ > > {
127- let id;
128- let packet;
129- let bytes;
130-
131- if let Some ( arg) = args. get ( 1 ) {
132- if let Some ( value) = Self :: get_number ( arg) {
133- id = value;
134- } else {
135- return None ;
136- }
137- } else {
138- return None ;
139- }
140-
141- if let Some ( arg) = args. get ( 2 ) {
142- if let Some ( value) = Self :: get_number ( arg) {
143- packet = value;
144- } else {
145- return None ;
146- }
147- } else {
148- return None ;
149- }
150-
151- if let Some ( arg) = args. get ( 3 ) {
152- if let Some ( value) = Self :: get_bytes ( arg) {
153- bytes = value;
154- } else {
155- return None ;
156- }
157- } else {
158- return None ;
159- }
160-
161127 Some ( FtMessage :: Data ( FileData {
162128 timestamp,
163- id,
164- packet,
165- bytes,
129+ id : Self :: get_number ( args . get ( 1 ) ? ) ? ,
130+ packet : Self :: get_number ( args . get ( 2 ) ? ) ? ,
131+ bytes : Self :: get_bytes ( args . get ( 3 ) ? ) ? ,
166132 } ) )
167133 }
168134
@@ -174,19 +140,10 @@ impl FtMessageParser {
174140 /// * 1 DLT_UINT(file-id)
175141 /// * 2 DLT_STRING("FLFI")
176142 fn end_message ( timestamp : Option < u32 > , args : & [ Argument ] ) -> Option < FtMessage < ' _ > > {
177- let id;
178-
179- if let Some ( arg) = args. get ( 1 ) {
180- if let Some ( value) = Self :: get_number ( arg) {
181- id = value;
182- } else {
183- return None ;
184- }
185- } else {
186- return None ;
187- }
188-
189- Some ( FtMessage :: End ( FileEnd { timestamp, id } ) )
143+ Some ( FtMessage :: End ( FileEnd {
144+ timestamp,
145+ id : Self :: get_number ( args. get ( 1 ) ?) ?,
146+ } ) )
190147 }
191148
192149 /// Returns a string value from given argument, if any.
@@ -339,7 +296,7 @@ impl TempDir {
339296 pub fn assert_file ( & self , name : & str , content : & str ) {
340297 let path = self . dir . join ( name) ;
341298 let string =
342- std:: fs:: read_to_string ( & path) . unwrap_or_else ( |_| panic ! ( "{:?} should exist" , & path) ) ;
299+ std:: fs:: read_to_string ( & path) . unwrap_or_else ( |_| panic ! ( "{:?} should exist" , path) ) ;
343300 assert_eq ! ( string, content) ;
344301 }
345302}
0 commit comments