Merge pull request #53 from expenses/fix-wasm

Fix wasm, add wasm ci check, move files around to distinguish native and wasm code.

Author: yoshuawuyts

.github/workflows/ci.yml

@@ -62,3 +62,14 @@ jobs:
           git -c user.name='ci' -c user.email='ci' commit -m 'Deploy futures-timer API documentation'
           git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages
         if: github.event_name == 'push' && github.event.ref == 'refs/heads/master' && github.repository == 'async-rs/futures-timer'
+
+  check_wasm:
+    name: Check Wasm
+    needs: [test]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Install Rust and add wasm target
+        run: rustup update stable && rustup target add wasm32-unknown-unknown
+      - name: cargo check
+        run: cargo check --target wasm32-unknown-unknown --features wasm-bindgen

src/lib.rs

@@ -16,24 +16,12 @@
 #![deny(missing_docs)]
 #![warn(missing_debug_implementations)]
 
-mod arc_list;
-mod atomic_waker;
 #[cfg(not(all(target_arch = "wasm32", feature = "wasm-bindgen")))]
-mod delay;
+mod native;
 #[cfg(all(target_arch = "wasm32", feature = "wasm-bindgen"))]
-mod delay_wasm;
-mod global;
-mod heap;
-mod heap_timer;
-mod timer;
-
-use arc_list::{ArcList, Node};
-use atomic_waker::AtomicWaker;
-use heap::{Heap, Slot};
-use heap_timer::HeapTimer;
-use timer::{ScheduledTimer, Timer, TimerHandle};
+mod wasm;
 
 #[cfg(not(all(target_arch = "wasm32", feature = "wasm-bindgen")))]
-pub use self::delay::Delay;
+pub use self::native::Delay;
 #[cfg(all(target_arch = "wasm32", feature = "wasm-bindgen"))]
-pub use self::delay_wasm::Delay;
+pub use self::wasm::Delay;

src/native.rs

@@ -0,0 +1,15 @@
+mod arc_list;
+mod atomic_waker;
+mod delay;
+mod global;
+mod heap;
+mod heap_timer;
+mod timer;
+
+use self::arc_list::{ArcList, Node};
+use self::atomic_waker::AtomicWaker;
+use self::heap::{Heap, Slot};
+use self::heap_timer::HeapTimer;
+use self::timer::{ScheduledTimer, Timer, TimerHandle};
+
+pub use self::delay::Delay;

src/arc_list.rs renamed to src/native/arc_list.rs

@@ -12,9 +12,9 @@ use std::sync::{Arc, Mutex};
 use std::task::{Context, Poll};
 use std::time::{Duration, Instant};
 
-use crate::arc_list::Node;
-use crate::AtomicWaker;
-use crate::{ScheduledTimer, TimerHandle};
+use super::arc_list::Node;
+use super::AtomicWaker;
+use super::{ScheduledTimer, TimerHandle};
 
 /// A future representing the notification that an elapsed duration has
 /// occurred.

src/atomic_waker.rs renamed to src/native/atomic_waker.rs

@@ -9,7 +9,7 @@ use std::thread;
 use std::thread::Thread;
 use std::time::Instant;
 
-use crate::{Timer, TimerHandle};
+use super::{Timer, TimerHandle};
 
 pub struct HelperThread {
     thread: Option<thread::JoinHandle<()>>,

src/delay.rs renamed to src/native/delay.rs

@@ -2,7 +2,7 @@ use std::cmp::Ordering;
 use std::sync::Arc;
 use std::time::Instant;
 
-use crate::{Node, ScheduledTimer};
+use super::{Node, ScheduledTimer};
 
 /// Entries in the timer heap, sorted by the instant they're firing at and then
 /// also containing some payload data.

src/global.rs renamed to src/native/global.rs

@@ -9,8 +9,8 @@ use std::time::Instant;
 
 use std::future::Future;
 
-use crate::AtomicWaker;
-use crate::{global, ArcList, Heap, HeapTimer, Node, Slot};
+use super::AtomicWaker;
+use super::{global, ArcList, Heap, HeapTimer, Node, Slot};
 
 /// A "timer heap" used to power separately owned instances of `Delay`.
 ///

src/heap.rs renamed to src/native/heap.rs

@@ -23,7 +23,7 @@ impl Delay {
     /// Resets the timeout.
     #[inline]
     pub fn reset(&mut self, dur: Duration) {
-        *self = Delay::new(at);
+        *self = Delay::new(dur);
     }
 }