latest

Author: Phil Cummins

src/lib.rs

@@ -49,7 +49,6 @@ mod summary;
 mod test;
 mod util;
 
-
 wasmtime::component::bindgen!({
     path: "wit",
     world: "init",
@@ -215,8 +214,8 @@ pub async fn componentize(
     let embedded_python_standard_lib = embedded_python_standard_library()?;
     let embedded_helper_utils = embedded_helper_utils()?;
 
-    let (configs, mut libraries) = prelink::search_for_libraries_and_configs(python_path, module_worlds)?;
-
+    let (configs, mut libraries) =
+        prelink::search_for_libraries_and_configs(python_path, module_worlds, world)?;
 
     // Next, iterate over all the WIT directories, merging them into a single `Resolve`, and matching Python
     // packages to `WorldId`s.
@@ -675,9 +674,6 @@ fn add_wasi_and_stubs(
     Ok(())
 }
 
-
-
-
 fn add_wasi_imports<'a>(
     module: &'a [u8],
     imports: &mut HashMap<&'a str, HashMap<&'a str, FuncType>>,

src/prelink.rs

@@ -1,7 +1,11 @@
 #![deny(warnings)]
 
 use std::{
-    collections::{HashMap, HashSet}, fs::{self}, io::{self, Cursor}, ops::Deref, path::{Path, PathBuf}
+    collections::{HashMap, HashSet},
+    fs::{self},
+    io::{self, Cursor},
+    ops::Deref,
+    path::{Path, PathBuf},
 };
 
 use anyhow::{anyhow, bail, Context, Result};
@@ -90,8 +94,17 @@ fn library_from_so(library_name: &str) -> Result<Library, io::Error> {
     })
 }
 
-pub fn search_for_libraries_and_configs<'a>(python_path: &'a Vec<&'a str>, module_worlds: &'a [(&'a str, &'a str)]) 
--> Result<(IndexMap<String, (ConfigContext<ComponentizePyConfig>, Option<&'a str>)>, Vec<Library>), anyhow::Error> {
+pub fn search_for_libraries_and_configs<'a>(
+    python_path: &'a Vec<&'a str>,
+    module_worlds: &'a [(&'a str, &'a str)],
+    world: Option<&'a str>,
+) -> Result<
+    (
+        IndexMap<String, (ConfigContext<ComponentizePyConfig>, Option<&'a str>)>,
+        Vec<Library>,
+    ),
+    anyhow::Error,
+> {
     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());
@@ -107,7 +120,7 @@ pub fn search_for_libraries_and_configs<'a>(python_path: &'a Vec<&'a str>, modul
         library_path.push((*path, libraries));
     }
 
-    let mut libraries = bundle_libraries(library_path)?;
+    let libraries = bundle_libraries(library_path)?;
 
     // Validate the paths parsed from any componentize-py.toml files discovered above and match them up with
     // `module_worlds` entries.  Note that we use an `IndexMap` to preserve the order specified in `module_worlds`,
@@ -229,4 +242,4 @@ fn module_name(root: &Path, path: &Path) -> Option<String> {
     } else {
         None
     }
-}
+}