Update code to use new Supplier model.

rakudo · Nov 25, 2015 · 0c4e50f · 0c4e50f
1 parent 0a8ab76
commit 0c4e50f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/src/core/IO/Notification.pm b/src/core/IO/Notification.pm
@@ -13,7 +13,7 @@ my class IO::Notification {
     }
 
     method watch-path(Str() $path, :$scheduler = $*SCHEDULER) {
-        my $s = Supply.new;
+        my $s = Supplier.new;
         nqp::watchfile(
             $scheduler.queue,
             -> \path, \rename, \err {
@@ -26,6 +26,6 @@ my class IO::Notification {
                 }
             },
             $path, FileWatchCancellation);
-        $s
+        $s.Supply
     }
 }
diff --git a/src/core/List.pm b/src/core/List.pm
@@ -4,6 +4,7 @@ my class X::TypeCheck::Splice { ... }
 my class X::Cannot::Lazy { ... }
 my class X::Cannot::Empty { ... }
 my class Supply { ... }
+my class Supplier { ... }
 
 my sub combinations(\n, \k) {
     return ((),) if k < 1;

diff --git a/src/core/Proc/Async.pm b/src/core/Proc/Async.pm
@@ -63,23 +63,23 @@ my class Proc::Async {
           if the-supply and type != value;
 
         type         = value;
-        the-supply //= Supply.new;
+        the-supply //= Supplier.new;
     }
 
     proto method stdout(|) { * }
     multi method stdout(Proc::Async:D:) {
-        self!supply('stdout', $!stdout_supply, $!stdout_type, Chars);
+        self!supply('stdout', $!stdout_supply, $!stdout_type, Chars).Supply;
     }
     multi method stdout(Proc::Async:D: :$bin!) {
-        self!supply('stdout',$!stdout_supply,$!stdout_type,$bin ?? Bytes !! Chars);
+        self!supply('stdout',$!stdout_supply,$!stdout_type,$bin ?? Bytes !! Chars).Supply;
     }
 
     proto method stderr(|) { * }
     multi method stderr(Proc::Async:D:) {
-        self!supply('stderr', $!stderr_supply, $!stderr_type, Chars);
+        self!supply('stderr', $!stderr_supply, $!stderr_type, Chars).Supply;
     }
     multi method stderr(Proc::Async:D: :$bin!) {
-        self!supply('stderr',$!stderr_supply,$!stderr_type,$bin ?? Bytes !! Chars);
+        self!supply('stderr',$!stderr_supply,$!stderr_type,$bin ?? Bytes !! Chars).Supply;
     }
 
     method !capture(\callbacks,\std,\type,\the-supply) {

diff --git a/src/core/Promise.pm b/src/core/Promise.pm
@@ -204,7 +204,7 @@ my class Promise {
     }
 
     method Supply(Promise:D:) {
-        my $s = Supply.new;
+        my $s = Supplier.new;
         self.then({
             if self.status == Kept {
                 $s.emit(self.result);
@@ -214,7 +214,7 @@ my class Promise {
                 $s.quit(self.cause);
             }
         });
-        $s
+        $s.Supply
     }
 
     # experimental

diff --git a/src/core/signals.pm b/src/core/signals.pm
@@ -55,12 +55,12 @@ sub signal(Signal $signal, *@signals, :$scheduler = $*SCHEDULER) {
 
     my class SignalCancellation is repr('AsyncTask') { }
     Supply.merge( @signals.map(-> $sig {
-        my $s = Supply.new;
+        my $s = Supplier.new;
         nqp::signal($scheduler.queue,
             -> $signum { $s.emit(@known_signals[$signum] // $signum) },
             nqp::unbox_i(%sigmap{$sig}),
             SignalCancellation);
-        $s
+        $s.Supply
     }) );
 }