diff options
Diffstat (limited to 'tvix/store')
| -rw-r--r-- | tvix/store/src/blobservice/grpc.rs | 2 | ||||
| -rw-r--r-- | tvix/store/src/blobservice/tests.rs | 20 | ||||
| -rw-r--r-- | tvix/store/src/directoryservice/traverse.rs | 6 | ||||
| -rw-r--r-- | tvix/store/src/fuse/inode_tracker.rs | 12 | ||||
| -rw-r--r-- | tvix/store/src/fuse/tests.rs | 17 | ||||
| -rw-r--r-- | tvix/store/src/proto/tests/grpc_blobservice.rs | 2 | ||||
| -rw-r--r-- | tvix/store/src/tests/nar_renderer.rs | 4 |
7 files changed, 27 insertions, 36 deletions
diff --git a/tvix/store/src/blobservice/grpc.rs b/tvix/store/src/blobservice/grpc.rs index a2ca16e6b3a6..71cde35cb21b 100644 --- a/tvix/store/src/blobservice/grpc.rs +++ b/tvix/store/src/blobservice/grpc.rs @@ -169,7 +169,7 @@ impl BlobService for GRPCBlobService { // bytes arriving on the RX side are wrapped inside a // [proto::BlobChunk], and a [ReceiverStream] is constructed. - let blobchunk_stream = ReceiverStream::new(rx).map(|x| proto::BlobChunk { data: x.into() }); + let blobchunk_stream = ReceiverStream::new(rx).map(|x| proto::BlobChunk { data: x }); // That receiver stream is used as a stream in the gRPC BlobService.put rpc call. let task: tokio::task::JoinHandle<Result<_, Status>> = self diff --git a/tvix/store/src/blobservice/tests.rs b/tvix/store/src/blobservice/tests.rs index cc43ce5b180a..ec7a618fab58 100644 --- a/tvix/store/src/blobservice/tests.rs +++ b/tvix/store/src/blobservice/tests.rs @@ -24,12 +24,9 @@ fn gen_sled_blob_service() -> impl BlobService { #[test_case(gen_memory_blob_service(); "memory")] #[test_case(gen_sled_blob_service(); "sled")] fn has_nonexistent_false(blob_service: impl BlobService) { - assert_eq!( - blob_service - .has(&fixtures::BLOB_A_DIGEST) - .expect("must not fail"), - false - ); + assert!(!blob_service + .has(&fixtures::BLOB_A_DIGEST) + .expect("must not fail")); } /// Trying to read a non-existing blob should return a None instead of a reader. @@ -62,9 +59,8 @@ fn put_has_get(blob_service: impl BlobService, blob_contents: &[u8], blob_digest assert_eq!(*blob_digest, digest, "returned digest must be correct"); - assert_eq!( + assert!( blob_service.has(blob_digest).expect("must not fail"), - true, "blob service should now have the blob" ); @@ -116,9 +112,7 @@ fn put_seek(blob_service: impl BlobService) { pos += buf.len() as u64; } // seek by 0 bytes, using SeekFrom::Start. - let p = r - .seek(io::SeekFrom::Start(pos as u64)) - .expect("must not fail"); + let p = r.seek(io::SeekFrom::Start(pos)).expect("must not fail"); assert_eq!(pos, p); // read the next 10 bytes, they must match the data in the fixture. @@ -136,9 +130,7 @@ fn put_seek(blob_service: impl BlobService) { } // seek by 5 bytes, using SeekFrom::Start. - let p = r - .seek(io::SeekFrom::Start(pos as u64 + 5)) - .expect("must not fail"); + let p = r.seek(io::SeekFrom::Start(pos + 5)).expect("must not fail"); pos += 5; assert_eq!(pos, p); diff --git a/tvix/store/src/directoryservice/traverse.rs b/tvix/store/src/directoryservice/traverse.rs index a385da3c63ef..9029543267c1 100644 --- a/tvix/store/src/directoryservice/traverse.rs +++ b/tvix/store/src/directoryservice/traverse.rs @@ -142,7 +142,7 @@ mod tests { ) .expect("must succeed"); - assert_eq!(Some(node_directory_with_keep.clone()), resp); + assert_eq!(Some(node_directory_with_keep), resp); } // traversal to `keep/.keep` should return the node for the .keep file @@ -166,7 +166,7 @@ mod tests { ) .expect("must succeed"); - assert_eq!(Some(node_file_keep.clone()), resp); + assert_eq!(Some(node_file_keep), resp); } // traversal to `void` should return None (doesn't exist) @@ -215,7 +215,7 @@ mod tests { ) .expect("must succeed"); - assert_eq!(Some(node_directory_complicated.clone()), resp); + assert_eq!(Some(node_directory_complicated), resp); } } } diff --git a/tvix/store/src/fuse/inode_tracker.rs b/tvix/store/src/fuse/inode_tracker.rs index 67d9d9b9bf46..97a9744c31d7 100644 --- a/tvix/store/src/fuse/inode_tracker.rs +++ b/tvix/store/src/fuse/inode_tracker.rs @@ -283,7 +283,7 @@ mod tests { let dir: InodeData = fixtures::DIRECTORY_WITH_KEEP.clone().into(); // put it in - let dir_ino = inode_tracker.put(dir.clone()); + let dir_ino = inode_tracker.put(dir); // a get should return the right data let data = inode_tracker.get(dir_ino).expect("must be some"); @@ -316,7 +316,7 @@ mod tests { InodeData::Regular(ref digest, size, executable) => { assert_eq!(&fixtures::EMPTY_BLOB_DIGEST.clone(), digest); assert_eq!(0, size); - assert_eq!(false, executable); + assert!(!executable); } InodeData::Symlink(_) | InodeData::Directory(..) => panic!("wrong type"), } @@ -335,7 +335,7 @@ mod tests { let dir_complicated: InodeData = fixtures::DIRECTORY_COMPLICATED.clone().into(); // put it in - let dir_complicated_ino = inode_tracker.put(dir_complicated.clone()); + let dir_complicated_ino = inode_tracker.put(dir_complicated); // a get should return the right data let dir_data = inode_tracker @@ -360,7 +360,7 @@ mod tests { // check the first child (.keep) { let (child_ino, child_node) = &children[0]; - assert!(!seen_inodes.contains(&child_ino)); + assert!(!seen_inodes.contains(child_ino)); assert_eq!( &proto::node::Node::File(fixtures::DIRECTORY_COMPLICATED.files[0].clone()), child_node @@ -371,7 +371,7 @@ mod tests { // check the second child (aa) { let (child_ino, child_node) = &children[1]; - assert!(!seen_inodes.contains(&child_ino)); + assert!(!seen_inodes.contains(child_ino)); assert_eq!( &proto::node::Node::Symlink( fixtures::DIRECTORY_COMPLICATED.symlinks[0].clone() @@ -384,7 +384,7 @@ mod tests { // check the third child (keep) { let (child_ino, child_node) = &children[2]; - assert!(!seen_inodes.contains(&child_ino)); + assert!(!seen_inodes.contains(child_ino)); assert_eq!( &proto::node::Node::Directory( fixtures::DIRECTORY_COMPLICATED.directories[0].clone() diff --git a/tvix/store/src/fuse/tests.rs b/tvix/store/src/fuse/tests.rs index 7d01902c6848..e5e36579b6c2 100644 --- a/tvix/store/src/fuse/tests.rs +++ b/tvix/store/src/fuse/tests.rs @@ -444,7 +444,7 @@ fn read_stat_directory() { let p = tmpdir.path().join(DIRECTORY_WITH_KEEP_NAME); // peek at the metadata of the directory - let metadata = fs::metadata(&p).expect("must succeed"); + let metadata = fs::metadata(p).expect("must succeed"); assert!(metadata.is_dir()); assert!(metadata.permissions().readonly()); @@ -667,8 +667,8 @@ fn compare_inodes_directories() { // peek at metadata. assert_eq!( - fs::metadata(&p_dir_with_keep).expect("must succeed").ino(), - fs::metadata(&p_sibling_dir).expect("must succeed").ino() + fs::metadata(p_dir_with_keep).expect("must succeed").ino(), + fs::metadata(p_sibling_dir).expect("must succeed").ino() ); fuser_session.join() @@ -697,8 +697,8 @@ fn compare_inodes_files() { // peek at metadata. assert_eq!( - fs::metadata(&p_keep1).expect("must succeed").ino(), - fs::metadata(&p_keep2).expect("must succeed").ino() + fs::metadata(p_keep1).expect("must succeed").ino(), + fs::metadata(p_keep2).expect("must succeed").ino() ); fuser_session.join() @@ -726,8 +726,8 @@ fn compare_inodes_symlinks() { // peek at metadata. assert_eq!( - fs::symlink_metadata(&p1).expect("must succeed").ino(), - fs::symlink_metadata(&p2).expect("must succeed").ino() + fs::symlink_metadata(p1).expect("must succeed").ino(), + fs::symlink_metadata(p2).expect("must succeed").ino() ); fuser_session.join() @@ -786,7 +786,7 @@ fn disallow_writes() { let fuser_session = setup_and_mount(tmpdir.path(), |_, _, _| {}).expect("must succeed"); let p = tmpdir.path().join(BLOB_A_NAME); - let e = std::fs::File::create(&p).expect_err("must fail"); + let e = std::fs::File::create(p).expect_err("must fail"); assert_eq!(std::io::ErrorKind::Unsupported, e.kind()); @@ -815,7 +815,6 @@ fn missing_directory() { // It fails when trying to pull the first entry, because we don't implement opendir separately fs::read_dir(&p) .unwrap() - .into_iter() .next() .expect("must be some") .expect_err("must be err"); diff --git a/tvix/store/src/proto/tests/grpc_blobservice.rs b/tvix/store/src/proto/tests/grpc_blobservice.rs index 8ad4e33ca469..497893f03dd7 100644 --- a/tvix/store/src/proto/tests/grpc_blobservice.rs +++ b/tvix/store/src/proto/tests/grpc_blobservice.rs @@ -54,7 +54,7 @@ async fn put_read_stat() { // Send blob A. let put_resp = service .put(tonic_mock::streaming_request(vec![BlobChunk { - data: BLOB_A.clone().into(), + data: BLOB_A.clone(), }])) .await .expect("must succeed") diff --git a/tvix/store/src/tests/nar_renderer.rs b/tvix/store/src/tests/nar_renderer.rs index 75dab76a95d9..102bf5e7ce24 100644 --- a/tvix/store/src/tests/nar_renderer.rs +++ b/tvix/store/src/tests/nar_renderer.rs @@ -177,7 +177,7 @@ fn test_complicated() { &mut buf, &crate::proto::node::Node::Directory(DirectoryNode { name: "doesntmatter".into(), - digest: DIRECTORY_COMPLICATED.digest().clone().into(), + digest: DIRECTORY_COMPLICATED.digest().into(), size: DIRECTORY_COMPLICATED.size(), }), blob_service.clone(), @@ -191,7 +191,7 @@ fn test_complicated() { let (nar_size, nar_digest) = calculate_size_and_sha256( &crate::proto::node::Node::Directory(DirectoryNode { name: "doesntmatter".into(), - digest: DIRECTORY_COMPLICATED.digest().clone().into(), + digest: DIRECTORY_COMPLICATED.digest().into(), size: DIRECTORY_COMPLICATED.size(), }), blob_service, |