Skip to content

Commit 514e025

Browse files
committed
fmt
1 parent f18fe8c commit 514e025

4 files changed

Lines changed: 100 additions & 91 deletions

File tree

crates/nfs3_types/tests/collections.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ fn empty_collections() {
9090
let len = empty_vec.pack(&mut buffer).unwrap();
9191
assert_eq!(len, 4); // Just the length field
9292
assert_eq!(buffer, [0, 0, 0, 0]);
93-
93+
9494
let mut cursor = Cursor::new(buffer);
9595
let (deserialized, len) = Vec::<u32>::unpack(&mut cursor).unwrap();
9696
assert_eq!(len, 4);
@@ -102,7 +102,7 @@ fn empty_collections() {
102102
let len = empty_list.pack(&mut buffer).unwrap();
103103
assert_eq!(len, 4); // Just the end marker
104104
assert_eq!(buffer, [0, 0, 0, 0]);
105-
105+
106106
let mut cursor = Cursor::new(buffer);
107107
let (deserialized, len) = List::<u32>::unpack(&mut cursor).unwrap();
108108
assert_eq!(len, 4);
@@ -117,7 +117,7 @@ fn single_item_collections() {
117117
let len = single_vec.pack(&mut buffer).unwrap();
118118
assert_eq!(len, 8); // 4 bytes length + 4 bytes data
119119
assert_eq!(buffer, [0, 0, 0, 1, 0x12, 0x34, 0x56, 0x78]);
120-
120+
121121
let mut cursor = Cursor::new(buffer);
122122
let (deserialized, len) = Vec::<u32>::unpack(&mut cursor).unwrap();
123123
assert_eq!(len, 8);
@@ -129,7 +129,7 @@ fn single_item_collections() {
129129
let len = single_list.pack(&mut buffer).unwrap();
130130
assert_eq!(len, 12); // 4 bytes indicator + 4 bytes data + 4 bytes end marker
131131
assert_eq!(buffer, [0, 0, 0, 1, 0x12, 0x34, 0x56, 0x78, 0, 0, 0, 0]);
132-
132+
133133
let mut cursor = Cursor::new(buffer);
134134
let (deserialized, len) = List::<u32>::unpack(&mut cursor).unwrap();
135135
assert_eq!(len, 12);
@@ -142,13 +142,13 @@ fn bounded_list_edge_cases() {
142142
// Even zero size should have the end marker, so it should be at least 4
143143
let mut bounded_list = BoundedList::<u32>::new(4); // Just end marker
144144
assert!(bounded_list.try_push(0x1234).is_err());
145-
145+
146146
// Test with exactly one item size
147147
// Each item needs 4 bytes indicator + 4 bytes data, plus 4 bytes end marker = 12 bytes total
148148
let mut bounded_list = BoundedList::<u32>::new(12);
149149
assert!(bounded_list.try_push(0x1234).is_ok());
150150
assert!(bounded_list.try_push(0x5678).is_err());
151-
151+
152152
let list = bounded_list.into_inner();
153153
assert_eq!(list.0, vec![0x1234]);
154154
}
@@ -160,12 +160,12 @@ fn large_collections() {
160160
let mut buffer = Vec::new();
161161
let len = large_vec.pack(&mut buffer).unwrap();
162162
assert_eq!(len, 404); // 4 bytes length + 100 * 4 bytes data
163-
163+
164164
let mut cursor = Cursor::new(buffer);
165165
let (deserialized, len) = Vec::<u32>::unpack(&mut cursor).unwrap();
166166
assert_eq!(len, 404);
167167
assert_eq!(large_vec, deserialized);
168-
168+
169169
// Test bounded list with many items
170170
// Each item needs 4 bytes indicator + 4 bytes data = 8 bytes per item
171171
// Plus 4 bytes for the end marker
@@ -175,7 +175,7 @@ fn large_collections() {
175175
assert!(bounded_list.try_push(i).is_ok(), "Failed to push item {i}");
176176
}
177177
assert!(bounded_list.try_push(100).is_err()); // Should fail on 101st item
178-
178+
179179
let list = bounded_list.into_inner();
180180
assert_eq!(list.0.len(), 100);
181181
assert_eq!(list.0, (0..100).collect::<Vec<u32>>());

crates/nfs3_types/tests/nfs3_types.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,14 @@ fn filename3_edge_cases() {
169169
let len = empty_name.pack(&mut buffer).unwrap();
170170
assert_eq!(len, 4); // Just the length field
171171
assert_eq!(buffer, [0, 0, 0, 0]);
172-
172+
173173
// Test single character filename
174174
let single_char = filename3::from(&b"a"[..]);
175175
let mut buffer = Vec::new();
176176
let len = single_char.pack(&mut buffer).unwrap();
177177
assert_eq!(len, 8); // 4 bytes length + 1 byte data + 3 bytes padding
178178
assert_eq!(buffer, [0, 0, 0, 1, b'a', 0, 0, 0]);
179-
179+
180180
// Test filename requiring no padding (multiple of 4)
181181
let quad_name = filename3::from(&b"test"[..]);
182182
let mut buffer = Vec::new();
@@ -192,48 +192,48 @@ fn nfs3_result_roundtrip() {
192192
Nfs3Result::<Void, Void>::Ok(Void),
193193
Nfs3Result::<Void, Void>::Err((nfsstat3::NFS3ERR_PERM, Void)),
194194
];
195-
195+
196196
for original in void_cases {
197197
let mut buffer = Vec::new();
198198
let pack_len = original.pack(&mut buffer).unwrap();
199199
assert_eq!(pack_len, original.packed_size());
200-
200+
201201
let mut cursor = Cursor::new(buffer);
202202
let (deserialized, unpack_len) = Nfs3Result::<Void, Void>::unpack(&mut cursor).unwrap();
203203
assert_eq!(pack_len, unpack_len);
204204
// Compare the discriminant and data separately since Nfs3Result doesn't implement PartialEq
205205
match (&original, &deserialized) {
206-
(Nfs3Result::Ok(_), Nfs3Result::Ok(_)) => {},
206+
(Nfs3Result::Ok(_), Nfs3Result::Ok(_)) => {}
207207
(Nfs3Result::Err((status1, _)), Nfs3Result::Err((status2, _))) => {
208208
assert_eq!(status1, status2);
209-
},
209+
}
210210
_ => panic!("Roundtrip mismatch"),
211211
}
212212
}
213-
213+
214214
// Test u32 cases
215215
let u32_cases = [
216216
Nfs3Result::<u32, u32>::Ok(0x1234_5678),
217217
Nfs3Result::<u32, u32>::Err((nfsstat3::NFS3ERR_NOENT, 0x8765_4321)),
218218
];
219-
219+
220220
for original in u32_cases {
221221
let mut buffer = Vec::new();
222222
let pack_len = original.pack(&mut buffer).unwrap();
223223
assert_eq!(pack_len, original.packed_size());
224-
224+
225225
let mut cursor = Cursor::new(buffer);
226226
let (deserialized, unpack_len) = Nfs3Result::<u32, u32>::unpack(&mut cursor).unwrap();
227227
assert_eq!(pack_len, unpack_len);
228228
// Compare the discriminant and data separately
229229
match (&original, &deserialized) {
230230
(Nfs3Result::Ok(val1), Nfs3Result::Ok(val2)) => {
231231
assert_eq!(val1, val2);
232-
},
232+
}
233233
(Nfs3Result::Err((status1, val1)), Nfs3Result::Err((status2, val2))) => {
234234
assert_eq!(status1, status2);
235235
assert_eq!(val1, val2);
236-
},
236+
}
237237
_ => panic!("Roundtrip mismatch"),
238238
}
239239
}
@@ -272,34 +272,34 @@ fn nfs3_error_codes() {
272272
nfsstat3::NFS3ERR_BADTYPE,
273273
nfsstat3::NFS3ERR_JUKEBOX,
274274
];
275-
275+
276276
for error_code in error_codes {
277277
let result = Nfs3Result::<Void, Void>::Err((error_code, Void));
278278
let mut buffer = Vec::new();
279279
let len = result.pack(&mut buffer).unwrap();
280280
assert_eq!(len, 4);
281-
281+
282282
let mut cursor = Cursor::new(buffer);
283283
let (deserialized, _) = Nfs3Result::<Void, Void>::unpack(&mut cursor).unwrap();
284284
// Compare error codes manually since Nfs3Result doesn't implement PartialEq
285285
match deserialized {
286286
Nfs3Result::Err((deserialized_code, _)) => {
287287
assert_eq!(error_code as u32, deserialized_code as u32);
288-
},
288+
}
289289
Nfs3Result::Ok(_) => panic!("Expected error result for error code {error_code:?}"),
290290
}
291291
}
292-
292+
293293
// Test NFS3_OK separately as a success case
294294
let success_result = Nfs3Result::<Void, Void>::Ok(Void);
295295
let mut buffer = Vec::new();
296296
let len = success_result.pack(&mut buffer).unwrap();
297297
assert_eq!(len, 4);
298-
298+
299299
let mut cursor = Cursor::new(buffer);
300300
let (deserialized, _) = Nfs3Result::<Void, Void>::unpack(&mut cursor).unwrap();
301301
match deserialized {
302-
Nfs3Result::Ok(_) => {}, // Expected success
302+
Nfs3Result::Ok(_) => {} // Expected success
303303
Nfs3Result::Err(_) => panic!("Expected success result for NFS3_OK"),
304304
}
305305
}

crates/nfs3_types/tests/rpc_mount.rs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -133,39 +133,39 @@ fn mount3res_roundtrip() {
133133
fhandle: fhandle3(Opaque(Cow::Borrowed(&[0x12, 0x34, 0x56, 0x78]))),
134134
auth_flavors: vec![1, 2, 3],
135135
});
136-
136+
137137
let mut buffer = Vec::new();
138138
let pack_len = success_res.pack(&mut buffer).unwrap();
139139
assert_eq!(pack_len, success_res.packed_size());
140-
140+
141141
let mut cursor = Cursor::new(buffer);
142142
let (deserialized, unpack_len) = mountres3::unpack(&mut cursor).unwrap();
143143
assert_eq!(pack_len, unpack_len);
144-
144+
145145
match (&success_res, &deserialized) {
146146
(mountres3::Ok(ok1), mountres3::Ok(ok2)) => {
147147
assert_eq!(ok1.fhandle.0.as_ref(), ok2.fhandle.0.as_ref());
148148
assert_eq!(ok1.auth_flavors, ok2.auth_flavors);
149149
}
150150
_ => panic!("Expected success response"),
151151
}
152-
152+
153153
// Test error mount response
154154
let error_res = mountres3::Err(mountstat3::MNT3ERR_PERM);
155155
let mut buffer = Vec::new();
156156
let pack_len = error_res.pack(&mut buffer).unwrap();
157157
assert_eq!(pack_len, error_res.packed_size());
158-
158+
159159
let mut cursor = Cursor::new(buffer);
160160
let (deserialized, unpack_len) = mountres3::unpack(&mut cursor).unwrap();
161161
assert_eq!(pack_len, unpack_len);
162162
match (&error_res, &deserialized) {
163-
(mountres3::Err(err1), mountres3::Err(err2)) => {
164-
// Compare error codes by their discriminant values
165-
assert_eq!(*err1 as u32, *err2 as u32);
166-
}
167-
_ => panic!("Expected error response"),
163+
(mountres3::Err(err1), mountres3::Err(err2)) => {
164+
// Compare error codes by their discriminant values
165+
assert_eq!(*err1 as u32, *err2 as u32);
168166
}
167+
_ => panic!("Expected error response"),
168+
}
169169
}
170170

171171
#[test]
@@ -176,7 +176,7 @@ fn fhandle3_edge_cases() {
176176
let len = empty_fh.pack(&mut buffer).unwrap();
177177
assert_eq!(len, 4); // Just the length field
178178
assert_eq!(buffer, [0, 0, 0, 0]);
179-
179+
180180
// Test maximum size file handle (64 bytes)
181181
let max_data = vec![0x42; 64];
182182
let max_fh = fhandle3(Opaque(Cow::Borrowed(&max_data)));
@@ -192,7 +192,7 @@ fn opaque_auth_default() {
192192
let len = auth.pack(&mut buffer).unwrap();
193193
assert_eq!(len, 8); // 4 bytes flavor + 4 bytes length (no data)
194194
assert_eq!(buffer, [0, 0, 0, 0, 0, 0, 0, 0]);
195-
195+
196196
let mut cursor = Cursor::new(buffer);
197197
let (deserialized, unpack_len) = opaque_auth::unpack(&mut cursor).unwrap();
198198
assert_eq!(len, unpack_len);
@@ -206,12 +206,12 @@ fn opaque_auth_with_data() {
206206
flavor: auth_flavor::AUTH_UNIX,
207207
body: Opaque(Cow::Borrowed(&[0x12, 0x34, 0x56, 0x78])),
208208
};
209-
209+
210210
let mut buffer = Vec::new();
211211
let len = auth.pack(&mut buffer).unwrap();
212212
assert_eq!(len, 12); // 4 bytes flavor + 4 bytes length + 4 bytes data
213213
assert_eq!(buffer, [0, 0, 0, 1, 0, 0, 0, 4, 0x12, 0x34, 0x56, 0x78]);
214-
214+
215215
let mut cursor = Cursor::new(buffer);
216216
let (deserialized, unpack_len) = opaque_auth::unpack(&mut cursor).unwrap();
217217
assert_eq!(len, unpack_len);
@@ -232,23 +232,23 @@ fn mount_error_codes() {
232232
mountstat3::MNT3ERR_NOTSUPP,
233233
mountstat3::MNT3ERR_SERVERFAULT,
234234
];
235-
235+
236236
for error_code in error_codes {
237237
let res = mountres3::Err(error_code);
238238
let mut buffer = Vec::new();
239239
let len = res.pack(&mut buffer).unwrap();
240240
assert_eq!(len, 4);
241-
241+
242242
let mut cursor = Cursor::new(buffer);
243243
let (deserialized, _) = mountres3::unpack(&mut cursor).unwrap();
244244
match deserialized {
245245
mountres3::Err(deserialized_code) => {
246246
assert_eq!(error_code as u32, deserialized_code as u32);
247-
},
247+
}
248248
mountres3::Ok(_) => panic!("Expected error result for error code {error_code:?}"),
249249
}
250250
}
251-
251+
252252
// Test MNT3_OK separately as a success case would require a valid mount response
253253
// which is more complex, so we'll skip it in this simple error code test
254254
}
@@ -257,7 +257,7 @@ fn mount_error_codes() {
257257
fn rpc_program_constants() {
258258
// Test that common RPC program numbers are correctly defined
259259
assert_eq!(RPC_VERSION_2, 2);
260-
260+
261261
// Test typical NFS program numbers (these might be defined elsewhere)
262262
let call = call_body {
263263
rpcvers: RPC_VERSION_2,
@@ -267,7 +267,7 @@ fn rpc_program_constants() {
267267
cred: opaque_auth::default(),
268268
verf: opaque_auth::default(),
269269
};
270-
270+
271271
assert_eq!(call.prog, 100_003);
272272
assert_eq!(call.vers, 3);
273273
assert_eq!(call.rpcvers, RPC_VERSION_2);
@@ -282,17 +282,17 @@ fn auth_flavors() {
282282
auth_flavor::AUTH_SHORT,
283283
auth_flavor::AUTH_DES,
284284
];
285-
285+
286286
for flavor in auth_flavors {
287287
let auth = opaque_auth {
288288
flavor,
289289
body: Opaque(Cow::Borrowed(&[])),
290290
};
291-
291+
292292
let mut buffer = Vec::new();
293293
let len = auth.pack(&mut buffer).unwrap();
294294
assert_eq!(len, 8); // 4 bytes flavor + 4 bytes length
295-
295+
296296
let mut cursor = Cursor::new(buffer);
297297
let (deserialized, _) = opaque_auth::unpack(&mut cursor).unwrap();
298298
assert_eq!(auth.flavor, deserialized.flavor);

0 commit comments

Comments
 (0)