Merge branch 'dev'

* dev:
  fix travis on stable rust
  Update futures to 0.3.1 and test CI on stable rust

.travis.yml

@@ -1,5 +1,7 @@
 language: rust
-rust    : nightly
+rust    :
+  - stable
+  - nightly
 
 # Need to cache the whole `.cargo` directory to keep .crates.toml for
 # cargo-update to work
@@ -27,30 +29,25 @@ matrix:
 
   include:
 
-    # This won't work because we use a nightly feature in dev-dependencies and the feature leaks:
-    #
-    # - rust  : stable
-    #   script: cargo check
-
     - os: linux
 
       script:
-        - cargo test --all-features
-        - cargo test --all-features --release
+        - cargo test
+        - cargo test --release
         - cargo doc --no-deps --all-features
 
 
     - os: osx
 
       script:
-        - cargo test --all-features
+        - cargo test
 
 
 
     - os: windows
 
       script:
-        - cargo test --all-features
+        - cargo test
 
 
 

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Pharos Changelog
 
+## 0.4.1 - 2019-11-13
+
+- update dependencies to futures 0.3.1.
+- CI testing on stable rust.
+
 ## 0.4.0 - 2019-09-28
 
 - **BREAKING CHANGE**: The notify function had a sub optimal implemetation and did not allow notifying observers

Cargo.toml

@@ -7,12 +7,16 @@ status = "actively-developed"
 repository = "najamelan/pharos"
 
 [dependencies]
-[dependencies.futures-preview]
-features = ["async-await"]
-version = "^0.3.0-alpha"
+futures-channel = "^0.3"
+log = "^0.4"
+
+[dependencies.futures]
+default-features = false
+version = "^0.3"
 
 [dev-dependencies]
 assert_matches = "^1"
+futures = "^0.3"
 
 [features]
 external_doc = []
@@ -28,7 +32,7 @@ license = "Unlicense"
 name = "pharos"
 readme = "README.md"
 repository = "https://github.com/najamelan/pharos"
-version = "0.4.0"
+version = "0.4.1"
 
 [package.metadata]
 [package.metadata.docs]

Cargo.yml

@@ -10,7 +10,7 @@ package:
   # - merge dev branch into master
   # - create git tag
   #
-  version       : 0.4.0
+  version       : 0.4.1
   name          : pharos
   authors       : [ Naja Melan <[email protected]> ]
   edition       : '2018'
@@ -43,8 +43,11 @@ badges:
 
 dependencies:
 
-  futures-preview: { version: ^0.3.0-alpha, features: [async-await] }
+  futures        : { version: ^0.3, default-features: false }
+  futures-channel: ^0.3
+  log            : ^0.4
 
 dev-dependencies:
 
+  futures       : ^0.3
   assert_matches: ^1

TODO.md

@@ -1,5 +1,6 @@
 # TODO
 
+- use NonZeroUsize as parameter in bounded channel
 - make Events clone? means we can only work with broadcast channels
 - switch to more performant channels (crossbeam). Will be easier once they provide an async api.
 - allow other channel types, like a ringchannel which drops messages on outpacing? To prevent DDOS and OOM attacks?

src/lib.rs

@@ -50,21 +50,19 @@ mod import
 	{
 		std            :: { fmt, error::Error as ErrorTrait, ops::Deref, any::type_name } ,
 		std            :: { task::{ Poll, Context }, pin::Pin                           } ,
+		futures        :: { Stream, Sink, ready                                         } ,
 
-		futures ::
+		futures_channel::mpsc::
 		{
-			Stream, Sink, ready,
-
-			channel::mpsc::
-			{
-				self                                      ,
-				Sender            as FutSender            ,
-				Receiver          as FutReceiver          ,
-				UnboundedSender   as FutUnboundedSender   ,
-				UnboundedReceiver as FutUnboundedReceiver ,
-				SendError         as FutSendError         ,
-			} ,
+			self                                      ,
+			Sender            as FutSender            ,
+			Receiver          as FutReceiver          ,
+			UnboundedSender   as FutUnboundedSender   ,
+			UnboundedReceiver as FutUnboundedReceiver ,
+			SendError         as FutSendError         ,
 		},
+
+		log::*,
 	};
 
 	#[ cfg( test ) ]