@@ -79,9 +79,9 @@ fn map_core_fn(cfn: &bindgen::CoreFn) -> CoreFn {
7979 }
8080}
8181
82- fn parse_wit ( path : & Path ) -> Result < ( Resolve , Vec < PackageId > ) > {
82+ fn parse_wit ( path : & Path ) -> Result < ( Resolve , PackageId ) > {
8383 let mut resolve = Resolve :: default ( ) ;
84- let ids = if path. is_dir ( ) {
84+ let id = if path. is_dir ( ) {
8585 resolve. push_dir ( & path) ?. 0
8686 } else {
8787 let contents =
@@ -92,7 +92,7 @@ fn parse_wit(path: &Path) -> Result<(Resolve, Vec<PackageId>)> {
9292 } ;
9393 resolve. push_str ( & path, text) ?
9494 } ;
95- Ok ( ( resolve, ids ) )
95+ Ok ( ( resolve, id ) )
9696}
9797
9898impl Guest for SpidermonkeyEmbeddingSplicerComponent {
@@ -119,19 +119,19 @@ impl Guest for SpidermonkeyEmbeddingSplicerComponent {
119119 ) -> Result < SpliceResult , String > {
120120 let source_name = source_name. unwrap_or ( "source.js" . to_string ( ) ) ;
121121
122- let ( mut resolve, ids ) = if let Some ( wit_source) = wit_source {
122+ let ( mut resolve, id ) = if let Some ( wit_source) = wit_source {
123123 let mut resolve = Resolve :: default ( ) ;
124124 let path = PathBuf :: from ( "component.wit" ) ;
125- let ids = resolve
125+ let id = resolve
126126 . push_str ( & path, & wit_source)
127127 . map_err ( |e| e. to_string ( ) ) ?;
128- ( resolve, ids )
128+ ( resolve, id )
129129 } else {
130130 parse_wit ( & PathBuf :: from ( wit_path. unwrap ( ) ) ) . map_err ( |e| format ! ( "{:?}" , e) ) ?
131131 } ;
132132
133133 let world = resolve
134- . select_world ( & ids , world_name. as_deref ( ) )
134+ . select_world ( id , world_name. as_deref ( ) )
135135 . map_err ( |e| e. to_string ( ) ) ?;
136136
137137 let mut wasm_bytes = wit_component:: dummy_module ( & resolve, world) ;
0 commit comments