fixed formatting

Author: majabbour

program/rust/build.rs

@@ -2,17 +2,24 @@ mod build_utils;
 use bindgen::Builder;
 use std::vec::Vec;
 
-
 fn main() {
     println!("cargo:rustc-link-search=../c/target");
-    
-    let borsh_derives: Vec<String> = vec!["BorshSerialize".to_string(), "BorshDeserialize".to_string()];
+
+    let borsh_derives: Vec<String> =
+        vec!["BorshSerialize".to_string(), "BorshDeserialize".to_string()];
 
     //make a parser and to it type, traits pairs
     let mut parser = build_utils::DeriveAdderParserCallback::new();
     parser.register_traits("cmd_hdr", borsh_derives);
 
     //generate and write bindings
-    let bindings = Builder::default().header("./src/bindings.h").parse_callbacks(Box::new(parser)).rustfmt_bindings(true).generate().expect("Unable to generate bindings");
-    bindings.write_to_file("./bindings.rs").expect("Couldn't write bindings!");
+    let bindings = Builder::default()
+        .header("./src/bindings.h")
+        .parse_callbacks(Box::new(parser))
+        .rustfmt_bindings(true)
+        .generate()
+        .expect("Unable to generate bindings");
+    bindings
+        .write_to_file("./bindings.rs")
+        .expect("Couldn't write bindings!");
 }

program/rust/build_utils.rs

@@ -1,33 +1,35 @@
 use bindgen::callbacks::ParseCallbacks;
-use std::panic::UnwindSafe;
 use std::collections::HashMap;
+use std::panic::UnwindSafe;
 ///This type stores a hashmap from structnames
 ///to vectors of trait names, and ensures
 ///that the traits of each struct are added to its
 ///definition when an instance of this struct
 ///is provided as a ParseCallback for bindgen
 #[derive(Debug, Default)]
-pub struct DeriveAdderParserCallback<'a>{
-    pub types_to_traits: HashMap<&'a str, Vec<String>> ,
+pub struct DeriveAdderParserCallback<'a> {
+    pub types_to_traits: HashMap<&'a str, Vec<String>>,
 }
 
-impl <'a> DeriveAdderParserCallback<'a>{
+impl<'a> DeriveAdderParserCallback<'a> {
     ///create a parser that does not add any traits
     pub fn new() -> Self {
         Default::default()
     }
     //add pairs of types and their desired traits
-    pub fn register_traits(&mut self, type_name: &'a str ,traits: Vec<String>){
+    pub fn register_traits(&mut self, type_name: &'a str, traits: Vec<String>) {
         self.types_to_traits.insert(&type_name, traits);
     }
-    
 }
 
 //this is required to implement the callback trait
 impl UnwindSafe for DeriveAdderParserCallback<'_> {}
 
-impl ParseCallbacks for DeriveAdderParserCallback<'_>{
-    fn add_derives(&self, _name: &str) -> Vec<String>{
-        self.types_to_traits.get(_name).unwrap_or(&Vec::<String>::new()).to_vec()
+impl ParseCallbacks for DeriveAdderParserCallback<'_> {
+    fn add_derives(&self, _name: &str) -> Vec<String> {
+        self.types_to_traits
+            .get(_name)
+            .unwrap_or(&Vec::<String>::new())
+            .to_vec()
     }
-}
+}

program/rust/src/c_oracle_header.rs

@@ -5,7 +5,7 @@
 #![allow(unused_variables)]
 #![allow(dead_code)]
 //All the custom trait imports should go here
-use borsh::{BorshSerialize, BorshDeserialize};
+use borsh::{BorshDeserialize, BorshSerialize};
 //bindings.rs is generated by build.rs to include
 //things defined in bindings.h
-include!("../bindings.rs");
+include!("../bindings.rs");

program/rust/src/lib.rs

@@ -1,7 +1,6 @@
 mod c_oracle_header;
 mod time_machine_types;
 
-
 //Below is a high lever description of the rust/c setup.
 
 //As we migrate from C to Rust, our Rust code needs to be able to interract with C
@@ -19,8 +18,7 @@ mod time_machine_types;
 //the only limitation of our set up is that we can not unit test in rust, anything that calls
 //a c function. Though we can test functions that use constants/types defined in oracle.h
 
-
-//do not link with C during unit tests (which are built in native architecture, unlike libpyth.o) 
+//do not link with C during unit tests (which are built in native architecture, unlike libpyth.o)
 #[cfg(target_arch = "bpf")]
 #[link(name = "cpyth")]
 extern "C" {
@@ -42,4 +40,4 @@ pub extern "C" fn entrypoint(input: *mut u8) -> u64 {
     } else {
         return c_ret_val;
     }
-}
+}