Skip to content

fix: ensure correct reference to engine world in merge #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guybedford merged 1 commit into from
Dec 11, 2024
Merged

fix: ensure correct reference to engine world in merge #168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions crates/spidermonkey-embedding-splicer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ impl Guest for SpidermonkeyEmbeddingSplicerComponent {
wit_component::dummy_module(&resolve, world, wit_parser::Mangling::Standard32);

// merge the engine world with the target world, retaining the engine producers
let producers = if let Ok((
let (engine_world, producers) = if let Ok((
_,
Bindgen {
resolve: mut engine_resolve,
Expand Down Expand Up @@ -186,12 +186,13 @@ impl Guest for SpidermonkeyEmbeddingSplicerComponent {
.shift_remove(&serve)
.unwrap();
}
resolve
let map = resolve
.merge(engine_resolve)
.expect("unable to merge with engine world");
producers
let engine_world = map.map_world(engine_world, None).unwrap();
(engine_world, producers)
} else {
None
unreachable!();
};

let componentized = bindgen::componentize_bindgen(
Expand All @@ -204,11 +205,6 @@ impl Guest for SpidermonkeyEmbeddingSplicerComponent {
)
.map_err(|err| err.to_string())?;

let (engine_world, _) = resolve
.worlds
.iter()
.find(|(world, _)| resolve.worlds[*world].name == "root")
.unwrap();
resolve
.merge_worlds(engine_world, world)
.expect("unable to merge with engine world");
Expand Down
Loading