Skip to content

Commit 535aa31

Browse files
committed
Attempt to fix compilation issues on CI
Can't reproduce the errors on Azure locally, but hopefully tweaking generated code can get things to work.
1 parent c3e0edd commit 535aa31

File tree

9 files changed

+12
-8
lines changed

9 files changed

+12
-8
lines changed

crates/webidl-tests/array.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use js_sys::Object;
21
use wasm_bindgen::Clamped;
32
use wasm_bindgen_test::*;
43

crates/webidl-tests/array_buffer.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use js_sys::Object;
21
use wasm_bindgen_test::*;
32

43
include!(concat!(env!("OUT_DIR"), "/array_buffer.rs"));

crates/webidl-tests/build.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ fn main() {
1919
println!("processing {:?}", path);
2020
let mut generated_rust = wasm_bindgen_webidl::compile(&idl, None).unwrap();
2121

22+
generated_rust.insert_str(
23+
0,
24+
"
25+
mod generated_code {
26+
#[allow(unused_imports)]
27+
use js_sys::Object;
28+
",
29+
);
30+
2231
let out_file = out_dir.join(path.file_name().unwrap()).with_extension("rs");
2332

2433
generated_rust.push_str(&format!(
@@ -44,6 +53,8 @@ fn main() {
4453
i
4554
));
4655

56+
generated_rust.push_str("}\nuse self::generated_code::*;");
57+
4758
fs::write(&out_file, generated_rust).unwrap();
4859

4960
// Attempt to run rustfmt, but don't worry if it fails or if it isn't

crates/webidl-tests/callbacks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use js_sys::{Function, Object};
1+
use js_sys::Function;
22
use wasm_bindgen_test::*;
33

44
include!(concat!(env!("OUT_DIR"), "/callbacks.rs"));

crates/webidl-tests/consts.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use js_sys::Object;
21
use wasm_bindgen_test::*;
32

43
include!(concat!(env!("OUT_DIR"), "/consts.rs"));

crates/webidl-tests/enums.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use js_sys::Object;
21
use wasm_bindgen_test::*;
32

43
include!(concat!(env!("OUT_DIR"), "/enums.rs"));

crates/webidl-tests/global.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use js_sys::Object;
21
use wasm_bindgen::prelude::*;
32
use wasm_bindgen_test::*;
43

crates/webidl-tests/no_interface.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use js_sys::Object;
21
use wasm_bindgen_test::*;
32

43
include!(concat!(env!("OUT_DIR"), "/no_interface.rs"));

crates/webidl-tests/throws.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use js_sys::Object;
21
use wasm_bindgen_test::*;
32

43
include!(concat!(env!("OUT_DIR"), "/throws.rs"));

0 commit comments

Comments
 (0)