Browse Source

Take some cargo clippy advice

Ian Goldberg 1 year ago
parent
commit
6661c0f068
4 changed files with 9 additions and 10 deletions
  1. 3 3
      src/client.rs
  2. 1 2
      src/lib.rs
  3. 3 3
      src/server.rs
  4. 2 2
      src/spiral_mt.rs

+ 3 - 3
src/client.rs

@@ -90,7 +90,7 @@ impl Client {
                     Ok(Command::PreProc(num_preproc)) => {
                         // Ensure we don't already have outstanding
                         // preprocessing state
-                        assert!(preproc_out_state.len() == 0);
+                        assert!(preproc_out_state.is_empty());
                         let mut preproc_msg: Vec<PreProcSingleMsg> = Vec::new();
                         for _ in 0..num_preproc {
                             let rand_idx = (rng.next_u64() as usize) & num_records_mask;
@@ -265,7 +265,7 @@ pub extern "C" fn spir_client_preproc_finish(
         assert!(!msgdata.is_null());
         std::slice::from_raw_parts(msgdata, msglen)
     };
-    client.preproc_finish(&msg_slice);
+    client.preproc_finish(msg_slice);
 }
 
 #[no_mangle]
@@ -292,5 +292,5 @@ pub extern "C" fn spir_client_query_finish(
         assert!(!msgdata.is_null());
         std::slice::from_raw_parts(msgdata, msglen)
     };
-    client.query_finish(&msg_slice)
+    client.query_finish(msg_slice)
 }

+ 1 - 2
src/lib.rs

@@ -45,8 +45,7 @@ fn db_encrypt(
 ) -> Vec<u8> {
     let num_records: usize = 1 << r;
     let num_record_mask: usize = num_records - 1;
-    let mut ret = Vec::<u8>::with_capacity(num_records * mem::size_of::<DbEntry>());
-    ret.resize(num_records * mem::size_of::<DbEntry>(), 0);
+    let mut ret = vec![0; num_records * mem::size_of::<DbEntry>()];
     scope(|s| {
         let mut record_thread_start = 0usize;
         let records_per_thread_base = num_records / num_threads;

+ 3 - 3
src/server.rs

@@ -95,7 +95,7 @@ impl Server {
                             let dbslice =
                                 std::slice::from_raw_parts(db as *const DbEntry, num_records);
                             db_encrypt(
-                                &dbslice,
+                                dbslice,
                                 &nextstate.db_keys,
                                 r,
                                 totoffset,
@@ -196,7 +196,7 @@ pub extern "C" fn spir_server_preproc_process(
         assert!(!msgdata.is_null());
         std::slice::from_raw_parts(msgdata, msglen)
     };
-    let retvec = server.preproc_process(&msg_slice);
+    let retvec = server.preproc_process(msg_slice);
     to_vecdata(retvec)
 }
 
@@ -217,6 +217,6 @@ pub extern "C" fn spir_server_query_process(
         assert!(!msgdata.is_null());
         std::slice::from_raw_parts(msgdata, msglen)
     };
-    let retvec = server.query_process(&msg_slice, db, rot, blind);
+    let retvec = server.query_process(msg_slice, db, rot, blind);
     to_vecdata(retvec)
 }

+ 2 - 2
src/spiral_mt.rs

@@ -82,7 +82,7 @@ pub fn load_db_from_slice_mt(
                             let db_idx = j * num_per + ii;
 
                             let mut db_item =
-                                load_item_from_slice(&params, slice, instance, trial, db_idx);
+                                load_item_from_slice(params, slice, instance, trial, db_idx);
                             // db_item.reduce_mod(params.pt_modulus);
 
                             for z in 0..params.poly_len {
@@ -101,7 +101,7 @@ pub fn load_db_from_slice_mt(
                                 );
 
                                 unsafe {
-                                    vptr.offset(idx_dst as isize).write(
+                                    vptr.add(idx_dst).write(
                                         db_item_ntt.data[z]
                                             | (db_item_ntt.data[params.poly_len + z]
                                                 << PACKED_OFFSET_2),