formatting

Author: Phil Cummins

src/lib.rs

@@ -1,37 +1,53 @@
 #![deny(warnings)]
 
 use {
-    anyhow::{anyhow, bail, ensure, Context, Error, Result}, async_trait::async_trait, bytes::Bytes, component_init::Invoker, futures::future::FutureExt, heck::ToSnakeCase, indexmap::{IndexMap, IndexSet}, prelink::{embedded_helper_utils, embedded_python_standard_library}, serde::Deserialize, std::{
+    anyhow::{anyhow, bail, ensure, Context, Error, Result},
+    async_trait::async_trait,
+    bytes::Bytes,
+    component_init::Invoker,
+    futures::future::FutureExt,
+    heck::ToSnakeCase,
+    indexmap::{IndexMap, IndexSet},
+    prelink::{embedded_helper_utils, embedded_python_standard_library},
+    serde::Deserialize,
+    std::{
         collections::{HashMap, HashSet},
         env, fs,
         io::Cursor,
         iter,
         ops::Deref,
         path::{Path, PathBuf},
         str,
-    }, summary::{Escape, Locations, Summary}, wasm_convert::IntoValType, wasm_encoder::{
+    },
+    summary::{Escape, Locations, Summary},
+    wasm_convert::IntoValType,
+    wasm_encoder::{
         CodeSection, ExportKind, ExportSection, Function, FunctionSection, Instruction, Module,
         TypeSection,
-    }, wasmparser::{FuncType, Parser, Payload, TypeRef}, wasmtime::{
+    },
+    wasmparser::{FuncType, Parser, Payload, TypeRef},
+    wasmtime::{
         component::{Component, Instance, Linker, ResourceTable, ResourceType},
         Config, Engine, Store,
-    }, wasmtime_wasi::{
+    },
+    wasmtime_wasi::{
         pipe::{MemoryInputPipe, MemoryOutputPipe},
         DirPerms, FilePerms, WasiCtx, WasiCtxBuilder, WasiView,
-    }, wit_parser::{Resolve, TypeDefKind, UnresolvedPackageGroup, WorldId, WorldItem, WorldKey}
+    },
+    wit_parser::{Resolve, TypeDefKind, UnresolvedPackageGroup, WorldId, WorldItem, WorldKey},
 };
 
 mod abi;
 mod bindgen;
 mod bindings;
 pub mod command;
+mod prelink;
 #[cfg(feature = "pyo3")]
 mod python;
 mod summary;
 #[cfg(test)]
 mod test;
 mod util;
-mod prelink;
 
 static NATIVE_EXTENSION_SUFFIX: &str = ".cpython-312-wasm32-wasi.so";
 
@@ -204,7 +220,8 @@ pub async fn componentize(
     // the latter may contain their own WIT files defining their own worlds (in addition to what the caller
     // specified as paramters), which we'll try to match up with `module_worlds` in the next step.
     let mut raw_configs: Vec<crate::ConfigContext<crate::RawComponentizePyConfig>> = Vec::new();
-    let mut library_path: Vec<(&str, Vec<std::path::PathBuf>)> = Vec::with_capacity(python_path.len());
+    let mut library_path: Vec<(&str, Vec<std::path::PathBuf>)> =
+        Vec::with_capacity(python_path.len());
     for path in python_path {
         let mut libraries = Vec::new();
         search_directory(
@@ -414,8 +431,18 @@ pub async fn componentize(
         .env("PYTHONUNBUFFERED", "1")
         .env("COMPONENTIZE_PY_APP_NAME", app_name)
         .env("PYTHONHOME", "/python")
-        .preopened_dir(embedded_python_standard_lib.path(), "python", DirPerms::all(), FilePerms::all())?
-        .preopened_dir(embedded_helper_utils.path(), "bundled", DirPerms::all(), FilePerms::all())?;
+        .preopened_dir(
+            embedded_python_standard_lib.path(),
+            "python",
+            DirPerms::all(),
+            FilePerms::all(),
+        )?
+        .preopened_dir(
+            embedded_helper_utils.path(),
+            "bundled",
+            DirPerms::all(),
+            FilePerms::all(),
+        )?;
 
     // Generate guest mounts for each host directory in `python_path`.
     for (index, path) in python_path.iter().enumerate() {

src/prelink.rs

@@ -1,6 +1,9 @@
 #![deny(warnings)]
 
-use std::{fs, io::{self, Cursor}};
+use std::{
+    fs,
+    io::{self, Cursor},
+};
 
 use anyhow::Context;
 use tar::Archive;
@@ -10,16 +13,17 @@ use zstd::Decoder;
 use crate::Library;
 
 pub fn embedded_python_standard_library() -> Result<TempDir, io::Error> {
-        // Untar the embedded copy of the Python standard library into a temporary directory
-        let stdlib = tempfile::tempdir().expect("could not create temp dirfor python stnadard lib");
+    // Untar the embedded copy of the Python standard library into a temporary directory
+    let stdlib = tempfile::tempdir().expect("could not create temp dirfor python stnadard lib");
 
-        Archive::new(Decoder::new(Cursor::new(include_bytes!(concat!(
-            env!("OUT_DIR"),
-            "/python-lib.tar.zst"
-        ))))?)
-        .unpack(stdlib.path()).unwrap();
+    Archive::new(Decoder::new(Cursor::new(include_bytes!(concat!(
+        env!("OUT_DIR"),
+        "/python-lib.tar.zst"
+    ))))?)
+    .unpack(stdlib.path())
+    .unwrap();
 
-        return Ok(stdlib);
+    return Ok(stdlib);
 }
 
 pub fn embedded_helper_utils() -> Result<TempDir, io::Error> {
@@ -30,13 +34,15 @@ pub fn embedded_helper_utils() -> Result<TempDir, io::Error> {
         env!("OUT_DIR"),
         "/bundled.tar.zst"
     ))))?)
-    .unpack(bundled.path()).unwrap();
+    .unpack(bundled.path())
+    .unwrap();
 
     return Ok(bundled);
 }
 
-pub fn bundle_libraries(library_path: Vec<(&str, Vec<std::path::PathBuf>)>) -> Result<Vec<Library>, io::Error> {
-
+pub fn bundle_libraries(
+    library_path: Vec<(&str, Vec<std::path::PathBuf>)>,
+) -> Result<Vec<Library>, io::Error> {
     let mut libraries = vec![
         Library {
             name: "libcomponentize_py_runtime.so".into(),
@@ -109,7 +115,7 @@ pub fn bundle_libraries(library_path: Vec<(&str, Vec<std::path::PathBuf>)>) -> R
                 "/libc++abi.so.zst"
             ))))?,
             dl_openable: false,
-        }
+        },
     ];
 
     for (index, (path, libs)) in library_path.iter().enumerate() {