Skip to content

Commit e44cbe0

Browse files
committed
Merge branch 'master' into release
2 parents c2e9c1a + bd5a965 commit e44cbe0

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

Documentation/GettingStarted.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ The reason why 2 navigations are suggested is because first navigation forces lo
880880

881881
`Variable`s represent some observable state. `Variable` without containing value can't exist because initializer requires initial value.
882882

883-
Variable wraps a [`Subject`](http://reactivex.io/documentation/subject.html). More specifically it is a `BehaviorSubject`. Unlike `BehaviorSubject`, it only exposes `value` interface, so variable can never terminate or fail.
883+
Variable wraps a [`Subject`](http://reactivex.io/documentation/subject.html). More specifically it is a `BehaviorSubject`. Unlike `BehaviorSubject`, it only exposes `value` interface, so variable can never terminate with error.
884884

885885
It will also broadcast its current value immediately on subscription.
886886

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
[![Travis CI](https://travis-ci.org/ReactiveX/RxSwift.svg?branch=master)](https://travis-ci.org/ReactiveX/RxSwift) ![platforms](https://img.shields.io/badge/platforms-iOS%20%7C%20macOS%20%7C%20tvOS%20%7C%20watchOS%20%7C%20Linux-333333.svg) ![pod](https://img.shields.io/cocoapods/v/RxSwift.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
55

6+
* RxSwift 4.x / Swift 4.x can be found in [**rxswift4.0-swift4.0** branch](https://github.com/ReactiveX/RxSwift/tree/rxswift4.0-swift4.0).
7+
* RxSwift 3.x / Swift 3.x can be found in [**master** branch](https://github.com/ReactiveX/RxSwift/tree/master).
8+
69
Rx is a [generic abstraction of computation](https://youtu.be/looJcaeboBY) expressed through `Observable<Element>` interface.
710

811
This is a Swift version of [Rx](https://github.com/Reactive-Extensions/Rx.NET).

RxSwift/Schedulers/CurrentThreadScheduler.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ public class CurrentThreadScheduler : ImmediateSchedulerType {
5050

5151
private static var isScheduleRequiredKey: pthread_key_t = { () -> pthread_key_t in
5252
let key = UnsafeMutablePointer<pthread_key_t>.allocate(capacity: 1)
53-
if pthread_key_create(key, nil) != 0 {
53+
defer {
54+
key.deallocate(capacity: 1)
55+
}
56+
57+
guard pthread_key_create(key, nil) == 0 else {
5458
rxFatalError("isScheduleRequired key creation failed")
5559
}
5660

0 commit comments

Comments
 (0)