Merge pull request #632 from egrimley-arm/pr-rustfmt

Tidy up all the Rust files with rustfmt --edition=2018.

examples/data-generators/csv-encoder/src/main.rs

@@ -78,7 +78,7 @@
 //! file cannot be encoded, then the utility will abort with no output file
 //! written.
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/idash2017-logistic-regression-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator for sdk/examples/idash2017-logistic-regression
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/image-processing-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator sdk/examples/image-processing
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/intersection-set-sum-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator sdk/examples/intersection-set-sum
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/linear-regression-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator for sdk/examples/linear-regression
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/moving-average-convergence-divergence-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator sdk/examples/moving-average-convergence-divergence
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/number-stream-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator sdk/examples/number-stream-accumulation
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/postcard-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator examples/rust-examples/postcard-native and postcard-wasm
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/private-set-intersection-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator sdk/examples/private-set-intersection
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/private-set-intersection-sum-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator sdk/examples/private-set-intersection-sum
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/shamir-secret-sharing-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator sdk/examples/shamir-secret-sharing
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/data-generators/string-generator/src/main.rs

@@ -1,6 +1,6 @@
 //! Data generator sdk/examples/string-edit-distance
 //!
-//! # Authors
+//! # Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/rust-examples/huffman-encoding/.gitignore

@@ -1,2 +1,2 @@
-/target
-Cargo.lock
+/target
+Cargo.lock

examples/rust-examples/logistic-regression/src/main.rs

@@ -1,6 +1,6 @@
 //! Logistic regression example, using an off-the-shelf Rust library for machine learning.
 //!
-//! ## Context
+//! ## Context
 //!
 //! A number of competing supermarkets want to collectively pool some of their data on
 //! customer preferences to be able to better compete against their larger competitors.  However,
@@ -16,7 +16,7 @@
 //! Ensured form of outputs: A Postcard-encoded Rust vector of `f64` values describing the
 //!                          parameters of the learnt logistic regression model.
 //!
-//! ## Authors
+//! ## Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/rust-examples/number-stream-accumulation/src/main.rs

@@ -12,7 +12,7 @@
 //! Assumed 'stream-2' : A Postcard-encoded Rust vector of  `f64` values.
 //! Ensured 'output'   : A Postcard-encoded pair of `u64` and `f64`.
 //!
-//! ## Authors
+//! ## Authors
 //!
 //! The Veracruz Development Team.
 //!

examples/rust-examples/prime-numbers-generator/keep-primes/src/main.rs

@@ -13,7 +13,6 @@
 //! See the file `LICENSING.markdown` in the Veracruz root directory for licensing and
 //! copyright information.
 
-
 use anyhow;
 use std::fs;
 

examples/rust-examples/random-u32-list/src/main.rs

@@ -19,7 +19,12 @@ use std::fs;
 
 fn main() -> anyhow::Result<()> {
     let output = "/output/unsorted_numbers.txt";
-    let bytes = rand::thread_rng().gen::<[u32; 32]>().iter().map(|n| n.to_string()).collect::<Vec<String>>().join(",");
+    let bytes = rand::thread_rng()
+        .gen::<[u32; 32]>()
+        .iter()
+        .map(|n| n.to_string())
+        .collect::<Vec<String>>()
+        .join(",");
     println!("{}", bytes);
     fs::write(output, bytes)?;
     Ok(())

execution-engine/src/engines/wasmi.rs

@@ -1290,7 +1290,6 @@ impl WASMIRuntimeState {
         let address = args.nth_checked::<u32>(0)?;
         Self::convert_to_errno(self.vfs.fd_create(&mut self.memory()?, address))
     }
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////

execution-engine/src/engines/wasmtime.rs

@@ -1108,7 +1108,6 @@ impl WasmtimeRuntimeState {
         let mut vfs = lock_vfs!(caller_data);
         Self::convert_to_errno(vfs.fd_create(&mut caller, address))
     }
-
 }
 
 /// The `WasmtimeHostProvisioningState` implements everything needed to create a

execution-engine/src/fs.rs

@@ -448,10 +448,7 @@ impl InodeTable {
     /// Assume `path` is an absolute path to a (special) file.
     /// NOTE: this function is intended to be called after the root filesystem (handler) is
     /// created.
-    fn install_services(
-        &mut self,
-        native_modules: Vec<NativeModule>,
-    ) -> FileSystemResult<()> {
+    fn install_services(&mut self, native_modules: Vec<NativeModule>) -> FileSystemResult<()> {
         for native_module in native_modules {
             let path = match native_module.r#type() {
                 NativeModuleType::Static { special_file } => Some(special_file),
@@ -550,7 +547,7 @@ impl InodeTable {
         let inode = self.get(inode);
         match inode.map(|i| i.is_dir()).unwrap_or(false) {
             true => Ok(inode?.read_dir(&self)?.iter().count() <= 2),
-            false => Ok(false)
+            false => Ok(false),
         }
     }
 
@@ -792,7 +789,10 @@ impl FileSystem {
     /// and similar with respect to the parameter `std_streams_table`.  Userspace
     /// Wasm programs are going to expect that this is true, so we need to
     /// preallocate some files corresponding to those, here.
-    pub fn new(rights_table: RightsTable, native_modules: Vec<NativeModule>) -> FileSystemResult<Self> {
+    pub fn new(
+        rights_table: RightsTable,
+        native_modules: Vec<NativeModule>,
+    ) -> FileSystemResult<Self> {
         let mut rst = Self {
             fd_table: HashMap::new(),
             next_fd_candidate: Self::FIRST_FD,
@@ -964,10 +964,7 @@ impl FileSystem {
         Ok(())
     }
 
-    fn install_services(
-        &mut self,
-        native_modules: Vec<NativeModule>,
-    ) -> FileSystemResult<()> {
+    fn install_services(&mut self, native_modules: Vec<NativeModule>) -> FileSystemResult<()> {
         self.lock_inode_table()?.install_services(native_modules)
     }
 
@@ -1280,18 +1277,16 @@ impl FileSystem {
         // If it is a service, call it.
         // Warning: There is no input validity check performed here. It is the
         // native module's responsibility to implement that.
-        if is_service
-        {
+        if is_service {
             let (service, exec_config) = self
                 .lock_inode_table()?
                 .get_mut(&inode)?
                 .service_handler()?;
-            let native_module = service
-                .lock()
-                .map_err(|_| ErrNo::Busy)?;
+            let native_module = service.lock().map_err(|_| ErrNo::Busy)?;
 
             // Invoke native module manager
-            let mut native_module_manager = NativeModuleManager::new(*native_module.clone(), self.service_fs()?);
+            let mut native_module_manager =
+                NativeModuleManager::new(*native_module.clone(), self.service_fs()?);
             // Invoke native module with execution configuration
             native_module_manager.execute(exec_config)?;
         }
@@ -1918,7 +1913,10 @@ impl FileSystem {
         // Convert the absolute path to relative path and then find the inode
         let inode = self
             .lock_inode_table()?
-            .get_inode_by_inode_path(&InodeTable::ROOT_DIRECTORY_INODE, strip_root_slash_path(path))?
+            .get_inode_by_inode_path(
+                &InodeTable::ROOT_DIRECTORY_INODE,
+                strip_root_slash_path(path),
+            )?
             .0;
         let mut rst = Vec::new();
         if self.lock_inode_table()?.is_dir(&inode) {
@@ -1979,7 +1977,10 @@ impl FileSystem {
         // Convert the absolute path to relative path and then find the inode
         let inode = self
             .lock_inode_table()?
-            .get_inode_by_inode_path(&InodeTable::ROOT_DIRECTORY_INODE, strip_root_slash_path(path))?
+            .get_inode_by_inode_path(
+                &InodeTable::ROOT_DIRECTORY_INODE,
+                strip_root_slash_path(path),
+            )?
             .0;
         let mut rst = Vec::new();
         let mut top_level_files = Vec::new();
@@ -1988,7 +1989,10 @@ impl FileSystem {
             let (all_dir, is_dir_empty) = {
                 let inode_table = self.lock_inode_table()?;
                 let inode_entry = inode_table.get(&inode)?;
-                (inode_entry.read_dir(&inode_table)?, inode_table.is_dir_empty(&inode))
+                (
+                    inode_entry.read_dir(&inode_table)?,
+                    inode_table.is_dir_empty(&inode),
+                )
             };
             if is_dir_empty? {
                 // Directory is empty (current and parent directories don't
@@ -2010,7 +2014,8 @@ impl FileSystem {
                     {
                         let mut sub_absolute_path = path.to_path_buf();
                         sub_absolute_path.push(sub_relative_path);
-                        let (mut list, _) = self.read_all_files_and_dirs_by_absolute_path(&sub_absolute_path)?;
+                        let (mut list, _) =
+                            self.read_all_files_and_dirs_by_absolute_path(&sub_absolute_path)?;
                         rst.append(&mut list);
                         if path == Path::new("/") {
                             top_level_files.push(sub_absolute_path);

execution-engine/src/lib.rs

@@ -67,5 +67,11 @@ pub fn execute(
     pipeline: Box<Expr>,
     options: &Options,
 ) -> anyhow::Result<u32> {
-    Ok(pipeline::execute_pipeline(strategy, &mut caller_filesystem, &pipepine_filesystem, pipeline, options)?)
+    Ok(pipeline::execute_pipeline(
+        strategy,
+        &mut caller_filesystem,
+        &pipepine_filesystem,
+        pipeline,
+        options,
+    )?)
 }