From cd29f549aa70469e6059b1832b2b3ef5493f74e6 Mon Sep 17 00:00:00 2001 From: "yurii.ostapchuk" Date: Fri, 16 Dec 2016 19:00:38 +0200 Subject: [PATCH] fixed Event renamed api, somw compile warnings cleanup --- Stream/Readable.swift | 8 ++++---- Stream/ReadableEvents.swift | 2 +- Stream/Stream.swift | 2 +- Stream/Writable.swift | 4 ++-- Stream/WritableEvents.swift | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Stream/Readable.swift b/Stream/Readable.swift index c0aef72..b649c1c 100644 --- a/Stream/Readable.swift +++ b/Stream/Readable.swift @@ -160,7 +160,7 @@ public extension Readable { self.context.execute { if newValue && self._rimpl._flow == nil { self._rimpl._flow = self.on(.readable).react { - self.read() + let _ = self.read() } } else if !newValue && self._rimpl._flow != nil { self._rimpl._flow?() @@ -239,7 +239,7 @@ public extension Readable where InChunk : Creatable & BufferProtocol { let readableOff = self.on(.readable).react { //if we are not paused this one whould be called automatically if self.paused { - self.read() + let _ = self.read() } } @@ -318,7 +318,7 @@ public class RawReadableSpiTest : RawReadableSpi { } if self.data?.isEmpty ?? false { - self._push(nil) + let _ = self._push(nil) self.data = nil } } @@ -326,7 +326,7 @@ public class RawReadableSpiTest : RawReadableSpi { } func f() { - let aa = RawReadableSpi() + let _ = RawReadableSpi() } /*public class RawReadableTest: RawReadable { diff --git a/Stream/ReadableEvents.swift b/Stream/ReadableEvents.swift index 58cc7ae..d2203f6 100644 --- a/Stream/ReadableEvents.swift +++ b/Stream/ReadableEvents.swift @@ -53,7 +53,7 @@ public struct ReadableEventGroup { } public extension ReadableEventEmitterProtocol { - public func on(_ groupedEvent: ReadableEventGroup) -> EventConveyor { + public func on(_ groupedEvent: ReadableEventGroup) -> SignalStream { return self.on(groupedEvent.event) } diff --git a/Stream/Stream.swift b/Stream/Stream.swift index 293d1aa..224c6c2 100644 --- a/Stream/Stream.swift +++ b/Stream/Stream.swift @@ -38,7 +38,7 @@ public protocol StreamEventEmitterProtocol : EventEmitter { } public extension StreamEventEmitterProtocol { - func on(_ groupedEvent: StreamEventGroup) -> EventConveyor { + func on(_ groupedEvent: StreamEventGroup) -> SignalStream { return self.on(groupedEvent.event) } diff --git a/Stream/Writable.swift b/Stream/Writable.swift index d0cdc11..043ff52 100644 --- a/Stream/Writable.swift +++ b/Stream/Writable.swift @@ -128,7 +128,7 @@ public class WritableImpl : WritableEventEmitterProtoc let dataOff = r.on(.data).settle(in: self.context).react { chunk in //maybe we should handle the future result?? - self._write(data: chunk) + let _ = self._write(data: chunk) } let errorOff = r.on(.error).settle(in: self.context).react { e in @@ -139,7 +139,7 @@ public class WritableImpl : WritableEventEmitterProtoc } let endOff:SafeTask? = !end ? nil : r.on(.end).settle(in: self.context).react { - self._end() + let _ = self._end() } self._pipe = PipeConnection(readable: r, dataOff: dataOff, errorOff:errorOff, endOff:endOff) diff --git a/Stream/WritableEvents.swift b/Stream/WritableEvents.swift index 655f68e..dd565ba 100644 --- a/Stream/WritableEvents.swift +++ b/Stream/WritableEvents.swift @@ -59,7 +59,7 @@ public struct WritableEventGroup { } public extension WritableEventEmitterProtocol { - public func on(_ groupedEvent: WritableEventGroup) -> EventConveyor { + public func on(_ groupedEvent: WritableEventGroup) -> SignalStream { return self.on(groupedEvent.event) }