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.

Sign up for GitHub

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

Jump to bottom

Merge with parent project #5

Merged
merged 19 commits into from
Dec 23, 2020
Merged

Merge with parent project #5

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
937cc0c
Fix replacement for deprecated broadcastIn operator (#2382)
qwwdfsad Nov 13, 2020
addff4b
Prevent potential re-park when the unparking thread is too slow (#2381)
qwwdfsad Nov 13, 2020
f49fbf6
Fix a typo in select-expression.md (#2385)
MasoodFallahpoor Nov 14, 2020
37b95a9
Simplify JobNode.toString to reduce code and avoid potential StackOve…
elizarov Nov 14, 2020
dede17e
Don't unconditionally cast uCont in ScopeCoroutine cast to CoroutineS…
willbuck Nov 14, 2020
bc553ba
Conditionally create an instance of CancellationException in Channel.…
qwwdfsad Nov 16, 2020
598b861
Add lint warnings on SharedFlow operations that never complete (#2376)
elizarov Nov 17, 2020
8ca5296
Make SharingStarted a fun interface (#2397)
elizarov Nov 17, 2020
4fe809f
Unlock Mutex and release Semaphore during cancellation on a fast bran…
qwwdfsad Nov 18, 2020
31a8df0
Clarify thread-safety of SharedFlow methods in docs (#2399)
elizarov Nov 18, 2020
81577b2
Clarify withContext(NonCancellable) behavior (#2400)
elizarov Nov 18, 2020
179f142
Add build parameter to build coroutines with JVM IR compiler (#2389)
ALikhachev Nov 18, 2020
e88e58d
Correct a typo in the doc of SharingStarted. (#2403)
lowasser Nov 21, 2020
c542b83
Fix indents in the documentation
qwwdfsad Nov 25, 2020
0e5aefd
Remove platform-specific dependencies on JavaFx artifacts (#2369)
elizarov Nov 26, 2020
c742db2
Repair some corner cases in cancellation propagation between coroutin…
vadimsemenov Nov 26, 2020
4bbd4e2
Merge branch 'master' into develop
qwwdfsad Nov 26, 2020
b221094
Version 1.4.2
qwwdfsad Nov 26, 2020
7223897
Merge pull request #2412 from Kotlin/version-1.4.2
qwwdfsad Nov 26, 2020
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
Prev Previous commit
Next Next commit
Fix indents in the documentation
  • Loading branch information
@qwwdfsad
qwwdfsad committed Nov 25, 2020
commit c542b83a07667f50f74d6b8d23975b63a54446f3
4 changes: 2 additions & 2 deletions kotlinx-coroutines-debug/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ Coroutine "coroutine#2":DeferredCoroutine{Active}@289d1c02, state: SUSPENDED

Dumping only deferred
"coroutine#2":DeferredCoroutine{Active}, continuation is SUSPENDED at line kotlinx.coroutines.DeferredCoroutine.await$suspendImpl(Builders.common.kt:99)
"coroutine#3":DeferredCoroutine{Active}, continuation is SUSPENDED at line ExampleKt.computeOne(Example.kt:14)
"coroutine#4":DeferredCoroutine{Active}, continuation is SUSPENDED at line ExampleKt.computeTwo(Example.kt:19)
"coroutine#3":DeferredCoroutine{Active}, continuation is SUSPENDED at line ExampleKt.computeOne(Example.kt:14)
"coroutine#4":DeferredCoroutine{Active}, continuation is SUSPENDED at line ExampleKt.computeTwo(Example.kt:19)
```

### Status of the API
Expand Down