Skip to content

Commit 52defe6

Browse files
author
Phil Cummins
committed
remove , anyhow::Error from prelink
1 parent bdaa0b1 commit 52defe6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/prelink.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static NATIVE_EXTENSION_SUFFIX: &str = ".cpython-312-wasm32-wasi.so";
2121
type ConfigsMatchedWorlds<'a> =
2222
IndexMap<String, (ConfigContext<ComponentizePyConfig>, Option<&'a str>)>;
2323

24-
pub fn embedded_python_standard_library() -> Result<TempDir, io::Error> {
24+
pub fn embedded_python_standard_library() -> Result<TempDir> {
2525
// Untar the embedded copy of the Python standard library into a temporary directory
2626
let stdlib = tempfile::tempdir()?;
2727

@@ -35,7 +35,7 @@ pub fn embedded_python_standard_library() -> Result<TempDir, io::Error> {
3535
Ok(stdlib)
3636
}
3737

38-
pub fn embedded_helper_utils() -> Result<TempDir, io::Error> {
38+
pub fn embedded_helper_utils() -> Result<TempDir> {
3939
// Untar the embedded copy of helper utilities into a temporary directory
4040
let bundled = tempfile::tempdir()?;
4141

@@ -51,7 +51,7 @@ pub fn embedded_helper_utils() -> Result<TempDir, io::Error> {
5151

5252
pub fn bundle_libraries(
5353
library_path: Vec<(&str, Vec<PathBuf>)>,
54-
) -> Result<Vec<Library>, anyhow::Error> {
54+
) -> Result<Vec<Library>> {
5555
let mut libraries = vec![
5656
Library {
5757
name: "libcomponentize_py_runtime.so".into(),
@@ -152,7 +152,7 @@ pub fn search_for_libraries_and_configs<'a>(
152152
python_path: &'a Vec<&'a str>,
153153
module_worlds: &'a [(&'a str, &'a str)],
154154
world: Option<&'a str>,
155-
) -> Result<(ConfigsMatchedWorlds<'a>, Vec<Library>), anyhow::Error> {
155+
) -> Result<(ConfigsMatchedWorlds<'a>, Vec<Library>)> {
156156
let mut raw_configs: Vec<ConfigContext<RawComponentizePyConfig>> = Vec::new();
157157
let mut library_path: Vec<(&str, Vec<PathBuf>)> = Vec::with_capacity(python_path.len());
158158
for path in python_path {
@@ -219,7 +219,7 @@ fn search_directory(
219219
libraries: &mut Vec<PathBuf>,
220220
configs: &mut Vec<ConfigContext<RawComponentizePyConfig>>,
221221
modules_seen: &mut HashSet<String>,
222-
) -> Result<(), anyhow::Error> {
222+
) -> Result<()> {
223223
if path.is_dir() {
224224
for entry in fs::read_dir(path).with_context(|| path.display().to_string())? {
225225
search_directory(root, &entry?.path(), libraries, configs, modules_seen)?;

0 commit comments

Comments
 (0)