Skip to content

Commit cdd6c03

Browse files
Remove ISeq resource from WIT
1 parent 30eb98d commit cdd6c03

File tree

12 files changed

+13
-180
lines changed

12 files changed

+13
-180
lines changed

packages/gems/js/ext/js/bindgen/ext.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -147,32 +147,6 @@ void ruby_js_js_runtime_list_borrow_js_abi_value_free(ruby_js_js_runtime_list_bo
147147
}
148148
}
149149

150-
__attribute__((__import_module__("[export]ruby:js/ruby-runtime"), __import_name__("[resource-drop]rb-iseq")))
151-
extern void __wasm_import_exports_ruby_js_ruby_runtime_rb_iseq_drop(int32_t handle);
152-
153-
void exports_ruby_js_ruby_runtime_rb_iseq_drop_own(exports_ruby_js_ruby_runtime_own_rb_iseq_t handle) {
154-
__wasm_import_exports_ruby_js_ruby_runtime_rb_iseq_drop(handle.__handle);
155-
}
156-
157-
__attribute__(( __import_module__("[export]ruby:js/ruby-runtime"), __import_name__("[resource-new]rb-iseq")))
158-
extern int32_t __wasm_import_exports_ruby_js_ruby_runtime_rb_iseq_new(int32_t);
159-
160-
__attribute__((__import_module__("[export]ruby:js/ruby-runtime"), __import_name__("[resource-rep]rb-iseq")))
161-
extern int32_t __wasm_import_exports_ruby_js_ruby_runtime_rb_iseq_rep(int32_t);
162-
163-
exports_ruby_js_ruby_runtime_own_rb_iseq_t exports_ruby_js_ruby_runtime_rb_iseq_new(exports_ruby_js_ruby_runtime_rb_iseq_t *rep) {
164-
return (exports_ruby_js_ruby_runtime_own_rb_iseq_t) { __wasm_import_exports_ruby_js_ruby_runtime_rb_iseq_new((int32_t) rep) };
165-
}
166-
167-
exports_ruby_js_ruby_runtime_rb_iseq_t* exports_ruby_js_ruby_runtime_rb_iseq_rep(exports_ruby_js_ruby_runtime_own_rb_iseq_t handle) {
168-
return (exports_ruby_js_ruby_runtime_rb_iseq_t*) __wasm_import_exports_ruby_js_ruby_runtime_rb_iseq_rep(handle.__handle);
169-
}
170-
171-
__attribute__((__export_name__("ruby:js/ruby-runtime#[dtor]rb_iseq")))
172-
void __wasm_export_exports_ruby_js_ruby_runtime_rb_iseq_dtor(exports_ruby_js_ruby_runtime_rb_iseq_t* arg) {
173-
exports_ruby_js_ruby_runtime_rb_iseq_destructor(arg);
174-
}
175-
176150
__attribute__((__import_module__("[export]ruby:js/ruby-runtime"), __import_name__("[resource-drop]rb-abi-value")))
177151
extern void __wasm_import_exports_ruby_js_ruby_runtime_rb_abi_value_drop(int32_t handle);
178152

packages/gems/js/ext/js/bindgen/ext.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,6 @@ typedef struct ruby_js_js_runtime_list_borrow_js_abi_value_t {
4848
size_t len;
4949
} ruby_js_js_runtime_list_borrow_js_abi_value_t;
5050

51-
typedef struct exports_ruby_js_ruby_runtime_own_rb_iseq_t {
52-
int32_t __handle;
53-
} exports_ruby_js_ruby_runtime_own_rb_iseq_t;
54-
55-
typedef struct exports_ruby_js_ruby_runtime_rb_iseq_t exports_ruby_js_ruby_runtime_rb_iseq_t;
56-
57-
typedef exports_ruby_js_ruby_runtime_rb_iseq_t* exports_ruby_js_ruby_runtime_borrow_rb_iseq_t;
58-
5951
typedef struct exports_ruby_js_ruby_runtime_own_rb_abi_value_t {
6052
int32_t __handle;
6153
} exports_ruby_js_ruby_runtime_own_rb_abi_value_t;
@@ -134,12 +126,6 @@ void ruby_js_js_runtime_raw_integer_free(ruby_js_js_runtime_raw_integer_t *ptr);
134126

135127
void ruby_js_js_runtime_list_borrow_js_abi_value_free(ruby_js_js_runtime_list_borrow_js_abi_value_t *ptr);
136128

137-
extern void exports_ruby_js_ruby_runtime_rb_iseq_drop_own(exports_ruby_js_ruby_runtime_own_rb_iseq_t handle);
138-
139-
extern exports_ruby_js_ruby_runtime_own_rb_iseq_t exports_ruby_js_ruby_runtime_rb_iseq_new(exports_ruby_js_ruby_runtime_rb_iseq_t *rep);
140-
extern exports_ruby_js_ruby_runtime_rb_iseq_t* exports_ruby_js_ruby_runtime_rb_iseq_rep(exports_ruby_js_ruby_runtime_own_rb_iseq_t handle);
141-
void exports_ruby_js_ruby_runtime_rb_iseq_destructor(exports_ruby_js_ruby_runtime_rb_iseq_t *rep);
142-
143129
extern void exports_ruby_js_ruby_runtime_rb_abi_value_drop_own(exports_ruby_js_ruby_runtime_own_rb_abi_value_t handle);
144130

145131
extern exports_ruby_js_ruby_runtime_own_rb_abi_value_t exports_ruby_js_ruby_runtime_rb_abi_value_new(exports_ruby_js_ruby_runtime_rb_abi_value_t *rep);
-12 Bytes
Binary file not shown.

packages/gems/js/ext/js/bindgen/legacy/rb-abi-guest.c

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,6 @@ size_t new_size
1414
return ret;
1515
}
1616

17-
__attribute__((import_module("canonical_abi"), import_name("resource_drop_rb-iseq")))
18-
void __resource_rb_iseq_drop(uint32_t idx);
19-
20-
void rb_abi_guest_rb_iseq_free(rb_abi_guest_rb_iseq_t *ptr) {
21-
__resource_rb_iseq_drop(ptr->idx);
22-
}
23-
24-
__attribute__((import_module("canonical_abi"), import_name("resource_clone_rb-iseq")))
25-
uint32_t __resource_rb_iseq_clone(uint32_t idx);
26-
27-
rb_abi_guest_rb_iseq_t rb_abi_guest_rb_iseq_clone(rb_abi_guest_rb_iseq_t *ptr) {
28-
return (rb_abi_guest_rb_iseq_t){__resource_rb_iseq_clone(ptr->idx)};
29-
}
30-
31-
__attribute__((import_module("canonical_abi"), import_name("resource_new_rb-iseq")))
32-
uint32_t __resource_rb_iseq_new(uint32_t val);
33-
34-
rb_abi_guest_rb_iseq_t rb_abi_guest_rb_iseq_new(void *data) {
35-
return (rb_abi_guest_rb_iseq_t){__resource_rb_iseq_new((uint32_t) data)};
36-
}
37-
38-
__attribute__((import_module("canonical_abi"), import_name("resource_get_rb-iseq")))
39-
uint32_t __resource_rb_iseq_get(uint32_t idx);
40-
41-
void* rb_abi_guest_rb_iseq_get(rb_abi_guest_rb_iseq_t *ptr) {
42-
return (void*) __resource_rb_iseq_get(ptr->idx);
43-
}
44-
45-
__attribute__((export_name("canonical_abi_drop_rb-iseq")))
46-
void __resource_rb_iseq_dtor(uint32_t val) {
47-
if (rb_abi_guest_rb_iseq_dtor)
48-
rb_abi_guest_rb_iseq_dtor((void*) val);
49-
}
50-
5117
__attribute__((import_module("canonical_abi"), import_name("resource_drop_rb-abi-value")))
5218
void __resource_rb_abi_value_drop(uint32_t idx);
5319

packages/gems/js/ext/js/bindgen/legacy/rb-abi-guest.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,6 @@ extern "C"
88
#include <stdint.h>
99
#include <stdbool.h>
1010

11-
typedef struct {
12-
uint32_t idx;
13-
} rb_abi_guest_rb_iseq_t;
14-
void rb_abi_guest_rb_iseq_free(rb_abi_guest_rb_iseq_t *ptr);
15-
rb_abi_guest_rb_iseq_t rb_abi_guest_rb_iseq_clone(rb_abi_guest_rb_iseq_t *ptr);
16-
rb_abi_guest_rb_iseq_t rb_abi_guest_rb_iseq_new(void *data);
17-
void* rb_abi_guest_rb_iseq_get(rb_abi_guest_rb_iseq_t *ptr);
18-
19-
__attribute__((weak))
20-
void rb_abi_guest_rb_iseq_dtor(void *data);
21-
2211
typedef struct {
2312
uint32_t idx;
2413
} rb_abi_guest_rb_abi_value_t;

packages/gems/js/ext/js/bindgen/legacy/rb-abi-guest.wit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
resource rb-iseq
21
resource rb-abi-value
32
type rb-errno = s32
43
type rb-id = u32

packages/gems/js/ext/js/types.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ typedef exports_ruby_js_ruby_runtime_own_rb_abi_value_t
1010
rb_abi_guest_own_rb_abi_value_t;
1111
typedef exports_ruby_js_ruby_runtime_list_borrow_rb_abi_value_t
1212
rb_abi_guest_list_rb_abi_value_t;
13-
typedef exports_ruby_js_ruby_runtime_own_rb_iseq_t rb_abi_guest_rb_iseq_t;
1413
typedef exports_ruby_js_ruby_runtime_rb_id_t rb_abi_guest_rb_id_t;
1514
typedef exports_ruby_js_ruby_runtime_tuple2_own_rb_abi_value_s32_t
1615
rb_abi_guest_tuple2_rb_abi_value_s32_t;

packages/gems/js/ext/js/witapi-core.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,6 @@ void rb_abi_guest_rb_abi_value_dtor(void *data) {
188188
}
189189

190190
#ifdef JS_ENABLE_COMPONENT_MODEL
191-
void exports_ruby_js_ruby_runtime_rb_iseq_destructor(
192-
exports_ruby_js_ruby_runtime_rb_iseq_t *rep) {}
193-
194191
void exports_ruby_js_ruby_runtime_rb_abi_value_destructor(
195192
exports_ruby_js_ruby_runtime_rb_abi_value_t *rep) {
196193
rb_abi_guest_rb_abi_value_dtor((void *)rep);
@@ -214,7 +211,6 @@ __attribute__((noinline)) static void rb_abi_guest_ruby_init_thunk(int argc, cha
214211
ruby_options(argc, c_args);
215212
}
216213
void rb_abi_guest_ruby_init(rb_abi_guest_list_string_t *args) {
217-
void *result;
218214
int argc = args->len;
219215
char **c_args;
220216
c_strings_from_abi(args, c_args);

packages/gems/js/wit/ruby-runtime.wit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package ruby:js;
33
interface ruby-runtime {
44
use js-runtime.{js-abi-value};
55

6-
resource rb-iseq {}
76
resource rb-abi-value {}
87

98
type rb-errno = s32;

packages/npm-packages/ruby-wasm-wasi/src/bindgen/interfaces/ruby-js-ruby-runtime.d.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export namespace RubyJsRubyRuntime {
2424
* 4. `export-rb-value-to-js()` returns the staged value
2525
*/
2626
export function exportRbValueToJs(): RbAbiValue;
27-
export { RbIseq };
2827
export { RbAbiValue };
2928
}
3029
import type { JsAbiValue } from './ruby-js-js-runtime.js';
@@ -34,6 +33,3 @@ export type RbId = number;
3433

3534
export class RbAbiValue {
3635
}
37-
38-
export class RbIseq {
39-
}

0 commit comments

Comments
 (0)