Feature/#5045 more generics in RxJavaPlugins #5058
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
akarnokd
requested changes
Feb 3, 2017
| @@ -16,14 +16,26 @@ | |||
|
|
|||
| package io.reactivex.plugins; | |||
|
|
|||
| import io.reactivex.*; | |||
| import io.reactivex.Completable; | |||
There was a problem hiding this comment.
Yes. Changed the code style settings accordingly.
Do you have a code style configuration for IntelliJ Idea?
|
Looks like this needs rebasing. I'm sorrry, I'm trying to merge your PRs in proper order but multiple recent PRs change the same file(s). |
|
Yeah, no problem. Rebasing isn't too difficult ;-) |
|
fixed import and rebased |
jschneider
force-pushed
the
feature/#5045-more-generics
branch
from
c97d4e3
to
7011146
Compare
|
Looks like there is a compilation error with the changes. |
jschneider
force-pushed
the
feature/#5045-more-generics
branch
from
7011146
to
4ae8c82
Compare
|
Uups. Fixed it (at least I hope) |
Codecov Report@@ Coverage Diff @@
## 2.x #5058 +/- ##
============================================
- Coverage 95.65% 95.58% -0.08%
+ Complexity 5544 5538 -6
============================================
Files 612 612
Lines 39575 39575
Branches 5554 5554
============================================
- Hits 37857 37828 -29
- Misses 746 759 +13
- Partials 972 988 +16
Continue to review full report at Codecov.
|
akarnokd
approved these changes
Feb 6, 2017
| import io.reactivex.Observer; | ||
| import io.reactivex.Scheduler.Worker; | ||
| import io.reactivex.disposables.*; | ||
| import io.reactivex.disposables.Disposable; |
There was a problem hiding this comment.
Could you also restore these import changes to their * form?
| import io.reactivex.exceptions.TestException; | ||
| import io.reactivex.flowables.ConnectableFlowable; | ||
| import io.reactivex.functions.*; | ||
| import io.reactivex.functions.BiFunction; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I widened the bounds for the functions. Looks good for me.
Related to #5045