Skip to content

Commit

Permalink
rust: fix single_binding
Browse files Browse the repository at this point in the history
error: this match could be written as a `let` statement
   --> src/nfs/nfs3_records.rs:747:9
    |
747 | /         match result {
748 | |             (r, request) => {
749 | |                 assert_eq!(r.len(), 0);
750 | |                 assert_eq!(request.handle, expected_handle);
751 | |                 assert_eq!(request.name_vec, br#"bln"#);
752 | |             }
753 | |         }
    | |_________^
  • Loading branch information
catenacyber authored and victorjulien committed Jan 15, 2024
1 parent b141eb9 commit 259cdf1
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 172 deletions.
68 changes: 24 additions & 44 deletions rust/src/nfs/nfs2_records.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,9 @@ mod tests {
0x00, 0x00, 0xb2, 0x5a, 0x00, 0x00, 0x00, 0x29
];

let result = parse_nfs2_handle(buf).unwrap();
match result {
(r, res) => {
assert_eq!(r.len(), 0);
assert_eq!(res.value, buf);
}
}
let (r, res) = parse_nfs2_handle(buf).unwrap();
assert_eq!(r.len(), 0);
assert_eq!(res.value, buf);
}

#[test]
Expand All @@ -136,14 +132,10 @@ mod tests {
let (_, handle) = parse_nfs2_handle(buf).unwrap();
assert_eq!(handle.value, &buf[..32]);

let result = parse_nfs2_request_lookup(buf).unwrap();
match result {
(r, request) => {
assert_eq!(r.len(), 0);
assert_eq!(request.handle, handle);
assert_eq!(request.name_vec, b"am".to_vec());
}
}
let (r, request) = parse_nfs2_request_lookup(buf).unwrap();
assert_eq!(r.len(), 0);
assert_eq!(request.handle, handle);
assert_eq!(request.name_vec, b"am".to_vec());
}

#[test]
Expand All @@ -162,14 +154,10 @@ mod tests {
let (_, handle) = parse_nfs2_handle(buf).unwrap();
assert_eq!(handle.value, &buf[..32]);

let result = parse_nfs2_request_read(buf).unwrap();
match result {
(r, request) => {
assert_eq!(r.len(), 4);
assert_eq!(request.handle, handle);
assert_eq!(request.offset, 0);
}
}
let (r, request) = parse_nfs2_request_read(buf).unwrap();
assert_eq!(r.len(), 4);
assert_eq!(request.handle, handle);
assert_eq!(request.offset, 0);
}

#[test]
Expand All @@ -192,19 +180,15 @@ mod tests {
0x00, /*_data_padding*/
];

let result = parse_nfs2_reply_read(buf).unwrap();
match result {
(r, response) => {
assert_eq!(r.len(), 0);
assert_eq!(response.status, 0);
assert_eq!(response.attr_follows, 1);
assert_eq!(response.attr_blob.len(), 68);
assert_eq!(response.count, response.data_len);
assert!(!response.eof);
assert_eq!(response.data_len, 11);
assert_eq!(response.data, &buf[76..87]);
}
}
let (r, response) = parse_nfs2_reply_read(buf).unwrap();
assert_eq!(r.len(), 0);
assert_eq!(response.status, 0);
assert_eq!(response.attr_follows, 1);
assert_eq!(response.attr_blob.len(), 68);
assert_eq!(response.count, response.data_len);
assert!(!response.eof);
assert_eq!(response.data_len, 11);
assert_eq!(response.data, &buf[76..87]);
}

#[test]
Expand All @@ -223,13 +207,9 @@ mod tests {
0x00, 0x08, 0x16, 0x50
];

let result = parse_nfs2_attribs(buf).unwrap();
match result {
(r, res) => {
assert_eq!(r.len(), 0);
assert_eq!(res.atype, 1);
assert_eq!(res.asize, 0);
}
}
let (r, res) = parse_nfs2_attribs(buf).unwrap();
assert_eq!(r.len(), 0);
assert_eq!(res.atype, 1);
assert_eq!(res.asize, 0);
}
}
Loading

0 comments on commit 259cdf1

Please sign in to comment.