fix clippy

Author: Handy-caT

codegen/src/persist_index/generator.rs

@@ -159,7 +159,7 @@ impl Generator {
             .collect::<Vec<_>>();
 
         quote! {
-            pub fn persist(&mut self, path: &String) -> eyre::Result<()>
+            pub fn persist(&mut self, path: &str) -> eyre::Result<()>
             {
                 #(#persist_logic)*
                 Ok(())
@@ -220,7 +220,7 @@ impl Generator {
             .collect::<Vec<_>>();
 
         quote! {
-            pub fn parse_from_file(path: &String) -> eyre::Result<Self> {
+            pub fn parse_from_file(path: &str) -> eyre::Result<Self> {
                 #(#field_names_literals)*
 
                 Ok(Self {

codegen/src/persist_index/space.rs

@@ -84,8 +84,8 @@ impl Generator {
     fn gen_space_secondary_index_from_table_files_path_fn(&self) -> TokenStream {
         let fields: Vec<_> = self
             .field_types
-            .iter()
-            .map(|(i, _)| {
+            .keys()
+            .map(|i| {
                 let literal_name = Literal::string(i.to_string().as_str());
                 quote! {
                     #i: SpaceIndex::secondary_from_table_files_path(path, #literal_name)?,
@@ -109,8 +109,8 @@ impl Generator {
 
         let process: Vec<_> = self
             .field_types
-            .iter()
-            .map(|(i, _)| {
+            .keys()
+            .map(|i| {
                 quote! {
                     for event in events.#i {
                         self.#i.process_change_event(event)?;

codegen/src/persist_table/generator/space_file/mod.rs

@@ -199,7 +199,7 @@ impl Generator {
         let data_extension = Literal::string(WT_DATA_EXTENSION);
 
         quote! {
-            pub fn parse_file(path: &String) -> eyre::Result<Self> {
+            pub fn parse_file(path: &str) -> eyre::Result<Self> {
                 let mut primary_index = {
                     let mut primary_index = vec![];
                     let mut primary_file = std::fs::File::open(format!("{}/primary{}", path, #index_extension))?;

codegen/src/worktable/generator/index.rs

@@ -125,8 +125,8 @@ impl Generator {
         let idents = self
             .columns
             .indexes
-            .iter()
-            .map(|(_, idx)| &idx.name)
+            .values()
+            .map(|idx| &idx.name)
             .collect::<Vec<_>>();
 
         quote! {
@@ -161,8 +161,8 @@ impl Generator {
         let idents = self
             .columns
             .indexes
-            .iter()
-            .map(|(_, idx)| &idx.name)
+            .values()
+            .map(|idx| &idx.name)
             .collect::<Vec<_>>();
 
         quote! {
@@ -224,8 +224,8 @@ impl Generator {
         let idents = self
             .columns
             .indexes
-            .iter()
-            .map(|(_, idx)| &idx.name)
+            .values()
+            .map(|idx| &idx.name)
             .collect::<Vec<_>>();
 
         quote! {

src/in_memory/data.rs

@@ -209,7 +209,7 @@ impl<Row, const DATA_LENGTH: usize> Data<Row, DATA_LENGTH> {
 
         let inner_data = unsafe { &mut *self.inner_data.get() };
         let bytes = &mut inner_data[link.offset as usize..(link.offset + link.length) as usize];
-        Ok(bytes.iter().cloned().collect::<Vec<_>>())
+        Ok(bytes.to_vec())
     }
 
     pub fn get_bytes(&self) -> [u8; DATA_LENGTH] {

src/index/table_index_cdc.rs

@@ -7,6 +7,7 @@ use indexset::core::pair::Pair;
 
 pub trait TableIndexCdc<T> {
     fn insert_cdc(&self, value: T, link: Link) -> (Option<Link>, Vec<ChangeEvent<Pair<T, Link>>>);
+    #[allow(clippy::type_complexity)]
     fn remove_cdc(
         &self,
         value: T,

src/persistence/space/data.rs

@@ -34,7 +34,7 @@ impl<PkGenState, const DATA_LENGTH: u32> SpaceData<PkGenState, DATA_LENGTH> {
             (self.last_page_id * (DATA_LENGTH + GENERAL_HEADER_SIZE as u32) + offset) as u64,
         ))?;
         let bytes = rkyv::to_bytes::<rkyv::rancor::Error>(&self.current_data_length)?;
-        self.data_file.write(bytes.as_ref())?;
+        self.data_file.write_all(bytes.as_ref())?;
         Ok(())
     }
 }
@@ -100,7 +100,7 @@ where
     fn save_data(&mut self, link: Link, bytes: &[u8]) -> eyre::Result<()> {
         if link.page_id > self.last_page_id.into() {
             let mut page = GeneralPage {
-                header: GeneralHeader::new(link.page_id.into(), PageType::SpaceInfo, 0.into()),
+                header: GeneralHeader::new(link.page_id, PageType::SpaceInfo, 0.into()),
                 inner: DataPage {
                     length: 0,
                     data: [0; 1],

src/persistence/space/index/mod.rs

@@ -123,7 +123,7 @@ where
                 Strategy<Serializer<AlignedVec, ArenaHandle<'a>, Share>, rancor::Error>,
             >,
     {
-        let header = GeneralHeader::new(page_id.into(), PageType::Index, self.space_id);
+        let header = GeneralHeader::new(page_id, PageType::Index, self.space_id);
         let mut general_page = GeneralPage {
             inner: node,
             header,
@@ -170,7 +170,7 @@ where
             utility.current_index,
         )?;
 
-        if &node_id < &value.key {
+        if node_id < value.key {
             utility.node_id = value.key.clone();
             new_node_id = Some(value.key);
         }
@@ -212,7 +212,7 @@ where
         utility.current_length -= 1;
         IndexPage::<T>::remove_value(&mut self.index_file, page_id, size, utility.current_index)?;
 
-        if &node_id == &value.key {
+        if node_id == value.key {
             let index = *utility
                 .slots
                 .get(index - 1)

src/persistence/space/index/table_of_contents.rs

@@ -114,7 +114,7 @@ where
     }
 
     pub fn iter(&self) -> impl Iterator<Item = (&T, &PageId)> {
-        self.pages.iter().map(|v| v.inner.iter()).flatten()
+        self.pages.iter().flat_map(|v| v.inner.iter())
     }
 
     pub fn update_key(&mut self, old_key: &T, new_key: T)

src/table/mod.rs

@@ -157,6 +157,7 @@ where
         Ok(pk)
     }
 
+    #[allow(clippy::type_complexity)]
     pub fn insert_cdc<SecondaryEvents>(
         &self,
         row: Row,