diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84e32dca..e3b52e1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: - { target: aarch64-apple-ios, os: macos-latest, } # We're using Windows rather than Ubuntu to run the wasm tests because caching cargo-web # doesn't currently work on Linux. - - { target: wasm32-unknown-unknown, os: windows-latest, cmd: web } + - { target: wasm32-unknown-unknown, os: windows-latest, } env: RUST_BACKTRACE: 1 @@ -76,10 +76,6 @@ jobs: - name: Install cargo-apk if: contains(matrix.platform.target, 'android') run: cargo install cargo-apk - - name: Install cargo-web - continue-on-error: true - if: contains(matrix.platform.target, 'wasm32') - run: cargo install cargo-web - name: Check documentation shell: bash diff --git a/examples/control_flow.rs b/examples/control_flow.rs index 64372a9b..cbb445ee 100644 --- a/examples/control_flow.rs +++ b/examples/control_flow.rs @@ -99,7 +99,7 @@ fn main() { if wait_cancelled { *control_flow } else { - ControlFlow::WaitUntil(time::Instant::now() + WAIT_TIME) + ControlFlow::WaitUntil(instant::Instant::now() + WAIT_TIME) } } Mode::Poll => { diff --git a/examples/request_redraw_threaded.rs b/examples/request_redraw_threaded.rs index 1456f254..d725cc8d 100644 --- a/examples/request_redraw_threaded.rs +++ b/examples/request_redraw_threaded.rs @@ -7,6 +7,7 @@ use winit::{ window::WindowBuilder, }; +#[cfg(not(target_arch = "wasm32"))] fn main() { SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); @@ -38,3 +39,8 @@ fn main() { } }); } + +#[cfg(target_arch = "wasm32")] +fn main() { + unimplemented!() // `Window` can't be sent between threads +}