Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.x: rework Single internals to reduce overhead and stack depth #4648

Merged
merged 2 commits into from
Oct 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/rx/Completable.java
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ public void call(rx.CompletableSubscriber s) {
* @return the new Completable instance
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
*/
@SuppressWarnings("deprecation")
@Experimental
public static Completable fromEmitter(Action1<CompletableEmitter> producer) {
return create(new CompletableFromEmitter(producer));
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/rx/Observable.java
Original file line number Diff line number Diff line change
Expand Up @@ -2016,15 +2016,15 @@ public static <T> Observable<T> from(T[] array) {
* @see AsyncEmitter.BackpressureMode
* @see AsyncEmitter.Cancellable
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
* @deprecated since 1.2.1 because Async prefix of AsyncEmitter class is potentially misleading. Use
* @deprecated since 1.2.1 because Async prefix of AsyncEmitter class is potentially misleading. Use
* {@link #fromEmitter(Action1, Emitter.BackpressureMode)} instead.
*/
@Experimental
@Deprecated
public static <T> Observable<T> fromEmitter(Action1<AsyncEmitter<T>> emitter, AsyncEmitter.BackpressureMode backpressure) {
return create(new OnSubscribeFromAsyncEmitter<T>(emitter, backpressure));
}

/**
* Provides an API (via a cold Observable) that bridges the reactive world with the callback-style,
* generally non-backpressured world.
Expand Down Expand Up @@ -2063,7 +2063,7 @@ public static <T> Observable<T> fromEmitter(Action1<AsyncEmitter<T>> emitter, As
* @return the new Observable instance
* @see Emitter
* @see Emitter.BackpressureMode
* @see Emitter.Cancellable
* @see rx.functions.Cancellable
* @since (if this graduates from Experimental/Beta to supported, replace this parenthetical with the release number)
*/
@Experimental
Expand Down
Loading