From 401f66c8307040450351890d4abb5f6e63a77a2f Mon Sep 17 00:00:00 2001 From: behzad nouri Date: Tue, 6 Dec 2022 09:11:03 -0500 Subject: [PATCH] patches errors from clippy::seek_to_start_instead_of_rewind https://rust-lang.github.io/rust-clippy/master/index.html#seek_to_start_instead_of_rewind --- bucket_map/src/bucket_storage.rs | 2 +- rbpf-cli/src/main.rs | 4 ++-- runtime/src/append_vec.rs | 2 +- runtime/src/cache_hash_data.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bucket_map/src/bucket_storage.rs b/bucket_map/src/bucket_storage.rs index d528f26fc..2090eefe0 100644 --- a/bucket_map/src/bucket_storage.rs +++ b/bucket_map/src/bucket_storage.rs @@ -317,7 +317,7 @@ impl BucketStorage { data.seek(SeekFrom::Start(capacity * cell_size as u64 - 1)) .unwrap(); data.write_all(&[0]).unwrap(); - data.seek(SeekFrom::Start(0)).unwrap(); + data.rewind().unwrap(); measure_new_file.stop(); let mut measure_flush = Measure::start("measure_flush"); data.flush().unwrap(); // can we skip this? diff --git a/rbpf-cli/src/main.rs b/rbpf-cli/src/main.rs index 085992310..abd8eb8ce 100644 --- a/rbpf-cli/src/main.rs +++ b/rbpf-cli/src/main.rs @@ -22,7 +22,7 @@ use { std::{ fmt::{Debug, Formatter}, fs::File, - io::{Read, Seek, SeekFrom}, + io::{Read, Seek}, path::Path, time::{Duration, Instant}, }, @@ -244,7 +244,7 @@ before execting it in the virtual machine.", let mut file = File::open(Path::new(program)).unwrap(); let mut magic = [0u8; 4]; file.read_exact(&mut magic).unwrap(); - file.seek(SeekFrom::Start(0)).unwrap(); + file.rewind().unwrap(); let mut contents = Vec::new(); file.read_to_end(&mut contents).unwrap(); let syscall_registry = register_syscalls(&invoke_context.feature_set, true).unwrap(); diff --git a/runtime/src/append_vec.rs b/runtime/src/append_vec.rs index 2e5898758..661df861c 100644 --- a/runtime/src/append_vec.rs +++ b/runtime/src/append_vec.rs @@ -333,7 +333,7 @@ impl AppendVec { // expensive. data.seek(SeekFrom::Start((size - 1) as u64)).unwrap(); data.write_all(&[0]).unwrap(); - data.seek(SeekFrom::Start(0)).unwrap(); + data.rewind().unwrap(); data.flush().unwrap(); //UNSAFE: Required to create a Mmap diff --git a/runtime/src/cache_hash_data.rs b/runtime/src/cache_hash_data.rs index 4c8608661..43988af00 100644 --- a/runtime/src/cache_hash_data.rs +++ b/runtime/src/cache_hash_data.rs @@ -126,7 +126,7 @@ impl CacheHashDataFile { // expensive. data.seek(SeekFrom::Start(capacity - 1)).unwrap(); data.write_all(&[0]).unwrap(); - data.seek(SeekFrom::Start(0)).unwrap(); + data.rewind().unwrap(); data.flush().unwrap(); Ok(unsafe { MmapMut::map_mut(&data).unwrap() }) }