Skip to content

Commit b09dfa1

Browse files
committed
Update changelog, and fix exchanger in edge
1 parent 5752ab5 commit b09dfa1

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

CHANGELOG.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,23 @@ concurrent-ruby:
44

55
* [Promises](http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/Promises.html)
66
are moved from `concurrent-ruby-edge` to `concurrent-ruby`
7+
* Add support for TruffleRuby
8+
* (#734) Fix Array/Hash/Set construction broken on TruffleRuby
9+
* AtomicReference fixed
10+
* CI stabilization
11+
* remove sharp dependency edge -> core
12+
* remove warnings
13+
* documentation updates
14+
* Exchanger is no longer documented as edge since it was already available in
15+
`concurrent-ruby`
716
* (#644) Fix Map#each and #each_pair not returning enumerator outside of MRI
817
* (#659) Edge promises fail during error handling
918
* (#741) Raise on recursive Delay#value call
1019
* (#727) #717 fix global IO executor on JRuby
1120
* (#740) Drop support for CRuby 1.9, JRuby 1.7, Rubinius.
1221
* (#737) Move AtomicMarkableReference out of Edge
1322
* (#708) Prefer platform specific memory barriers
14-
* Add support for TruffleRuby
15-
* (#734) Fix Array/Hash/Set construction broken on TruffleRuby
1623
* (#735) Fix wrong expected exception in channel spec assertion
17-
* CI stabilization
1824
* (#729) Allow executor option in `Promise#then`
1925
* (#725) fix timeout check to use timeout_interval
2026
* (#719) update engine detection
@@ -27,9 +33,6 @@ concurrent-ruby:
2733
v3.7.0
2834
* (#665) Initialize the monitor for new subarrays on Rubinius
2935
* (#661) Fix error handling in edge promises
30-
* remove sharp dependency edge -> core
31-
* remove warnings
32-
* documentation updates
3336

3437
concurrent-ruby-edge:
3538

lib-edge/concurrent-edge.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
require 'concurrent/actor'
44
require 'concurrent/agent'
55
require 'concurrent/channel'
6-
require 'concurrent/exchanger'
76
require 'concurrent/lazy_register'
87

98
require 'concurrent/edge/lock_free_linked_set'

lib/concurrent/exchanger.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ module Concurrent
2424
# will remain correct.
2525
#
2626
# @see http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Exchanger.html java.util.concurrent.Exchanger
27-
# @!macro warn.edge
2827
# @example
2928
#
3029
# exchanger = Concurrent::Exchanger.new

0 commit comments

Comments
 (0)