Skip to content

Commit bb96392

Browse files
committed
Fix YARD documentation
1 parent f6d1b54 commit bb96392

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+635
-678
lines changed

CHANGELOG.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,36 @@ 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-
* #644 Fix Map#each and #each_pair not returning enumerator outside of MRI
8-
* #659 Edge promises fail during error handling
9-
* #741 Raise on recursive Delay#value call
10-
* #727 #717 fix global IO executor on JRuby
11-
* #740 Drop support for CRuby 1.9, JRuby 1.7, Rubinius.
12-
* #737 Move AtomicMarkableReference out of Edge
13-
* #708 Prefer platform specific memory barriers
7+
* (#644) Fix Map#each and #each_pair not returning enumerator outside of MRI
8+
* (#659) Edge promises fail during error handling
9+
* (#741) Raise on recursive Delay#value call
10+
* (#727) #717 fix global IO executor on JRuby
11+
* (#740) Drop support for CRuby 1.9, JRuby 1.7, Rubinius.
12+
* (#737) Move AtomicMarkableReference out of Edge
13+
* (#708) Prefer platform specific memory barriers
1414
* Add support for TruffleRuby
15-
* #734 Fix Array/Hash/Set construction broken on TruffleRuby
16-
* #735 Fix wrong expected exception in channel spec assertion
15+
* (#734) Fix Array/Hash/Set construction broken on TruffleRuby
16+
* (#735) Fix wrong expected exception in channel spec assertion
1717
* CI stabilization
18-
* #729 Allow executor option in `Promise#then`
19-
* #725 fix timeout check to use timeout_interval
20-
* #719 update engine detection
21-
* #660 Add specs for Promise#zip/Promise.zip ordering
22-
* #654 Promise.zip execution changes
23-
* #666 Add thread safe set implementation
24-
* #651 #699 #to_s, #inspect should not output negative object IDs.
25-
* #685 Avoid RSpec warnings about raise_error
26-
* #680 Avoid RSpec monkey patching, persist spec results locally, use RSpec
18+
* (#729) Allow executor option in `Promise#then`
19+
* (#725) fix timeout check to use timeout_interval
20+
* (#719) update engine detection
21+
* (#660) Add specs for Promise#zip/Promise.zip ordering
22+
* (#654) Promise.zip execution changes
23+
* (#666) Add thread safe set implementation
24+
* (#651) #699 #to_s, #inspect should not output negative object IDs.
25+
* (#685) Avoid RSpec warnings about raise_error
26+
* (#680) Avoid RSpec monkey patching, persist spec results locally, use RSpec
2727
v3.7.0
28-
* #665 Initialize the monitor for new subarrays on Rubinius
29-
* #661 Fix error handling in edge promises
28+
* (#665) Initialize the monitor for new subarrays on Rubinius
29+
* (#661) Fix error handling in edge promises
3030
* remove sharp dependency edge -> core
3131
* remove warnings
3232
* documentation updates
3333

3434
concurrent-ruby-edge:
3535

36-
* #659 Edge promises fail during error handling
36+
* (#659) Edge promises fail during error handling
3737
* Edge files clearly separated in `lib-edge`
3838
* added ReInclude
3939

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ group :development do
1313
gem 'rake', '~> 12.0'
1414
gem 'rake-compiler', '~> 1.0'
1515
gem 'rake-compiler-dock', '~> 0.6.0'
16-
gem 'pry', '~> 0.11'
16+
gem 'pry', '~> 0.11', platforms: :mri
1717
end
1818

1919
group :documentation, optional: true do

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,13 +323,13 @@ best practice is to depend on `concurrent-ruby` and let users to decide if they
323323
* [Jerry D'Antonio](https://github.com/jdantonio) (creator)
324324
* [Chris Seaton](https://github.com/chrisseaton)
325325

326-
### Special Thanks
326+
### Special Thanks to
327327

328328
* [Brian Durand](https://github.com/bdurand) for the `ref` gem
329329
* [Charles Oliver Nutter](https://github.com/headius) for the `atomic` and `thread_safe` gems
330330
* [thedarkone](https://github.com/thedarkone) for the `thread_safe` gem
331331

332-
### Maintainers of the past
332+
and to the past maintainers
333333

334334
* [Michele Della Torre](https://github.com/mighe)
335335
* [Paweł Obrok](https://github.com/obrok)

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ begin
6666
desc '- test packaged and installed gems instead of local files'
6767
task :installed => :repackage do
6868
sh 'gem install pkg/concurrent-ruby-1.1.0.pre1.gem'
69-
sh 'gem install pkg/concurrent-ruby-ext-1.1.0.pre1.gem'
69+
sh 'gem install pkg/concurrent-ruby-ext-1.1.0.pre1.gem' if Concurrent.on_cruby?
7070
sh 'gem install pkg/concurrent-ruby-edge-0.4.0.pre1.gem'
7171
ENV['NO_PATH'] = 'true'
7272
sh 'bundle install'

concurrent-ruby-ext.gemspec

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ Gem::Specification.new do |s|
1717
EOF
1818

1919
s.files = Dir['ext/**/*.{h,c,cpp}']
20-
s.files += [
21-
'lib/concurrent/atomic_reference/concurrent_update_error.rb',
22-
'lib/concurrent/atomic_reference/direct_update.rb',
23-
'lib/concurrent/atomic_reference/numeric_cas_wrapper.rb',
24-
]
2520
s.extra_rdoc_files = Dir['README*', 'LICENSE*', 'CHANGELOG*']
2621
s.require_paths = ['lib']
2722
s.extensions = 'ext/concurrent-ruby-ext/extconf.rb'

doc/promises-main.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ This framework allows its users to:
4141
pressure (parts, which are not keeping up, signal to the other parts of the
4242
system to slow down).
4343

44-
**The guide is best place to start with promises, see**
45-
**{file:doc/promises.out.md}.**
44+
**The {file:doc/promises.out.md guide} is best place to start with promises.**
4645

4746
# Main classes
4847

lib-edge/concurrent/channel/buffer/base.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ module Buffer
1515
# used as a channel buffer should extend this class.
1616
class Base < Synchronization::LockableObject
1717

18-
# @!macro [attach] channel_buffer_capacity_reader
18+
# @!macro channel_buffer_capacity_reader
1919
#
2020
# The maximum number of values which can be {#put} onto the buffer
2121
# it becomes full.
2222
attr_reader :capacity
2323

24-
# @!macro [attach] channel_buffer_initialize
24+
# @!macro channel_buffer_initialize
2525
#
2626
# Creates a new buffer.
2727
def initialize(*args)
@@ -35,7 +35,7 @@ def initialize(*args)
3535
end
3636
end
3737

38-
# @!macro [attach] channel_buffer_blocking_question
38+
# @!macro channel_buffer_blocking_question
3939
#
4040
# Predicate indicating if this buffer will block {#put} operations
4141
# once it reaches its maximum capacity.
@@ -45,14 +45,14 @@ def blocking?
4545
true
4646
end
4747

48-
# @!macro [attach] channel_buffer_size_reader
48+
# @!macro channel_buffer_size_reader
4949
#
5050
# The number of items currently in the buffer.
5151
def size
5252
synchronize { ns_size }
5353
end
5454

55-
# @!macro [attach] channel_buffer_empty_question
55+
# @!macro channel_buffer_empty_question
5656
#
5757
# Predicate indicating if the buffer is empty.
5858
#
@@ -63,7 +63,7 @@ def empty?
6363
synchronize { ns_empty? }
6464
end
6565

66-
# @!macro [attach] channel_buffer_full_question
66+
# @!macro channel_buffer_full_question
6767
#
6868
# Predicate indicating if the buffer is full.
6969
#
@@ -74,7 +74,7 @@ def full?
7474
synchronize { ns_full? }
7575
end
7676

77-
# @!macro [attach] channel_buffer_put
77+
# @!macro channel_buffer_put
7878
#
7979
# Put an item onto the buffer if possible. If the buffer is open
8080
# but not able to accept the item the calling thread will block
@@ -89,7 +89,7 @@ def put(item)
8989
raise NotImplementedError
9090
end
9191

92-
# @!macro [attach] channel_buffer_offer
92+
# @!macro channel_buffer_offer
9393
#
9494
# Put an item onto the buffer if possible. If the buffer is open but
9595
# unable to add an item, probably due to being full, the method will
@@ -107,7 +107,7 @@ def offer(item)
107107
raise NotImplementedError
108108
end
109109

110-
# @!macro [attach] channel_buffer_take
110+
# @!macro channel_buffer_take
111111
#
112112
# Take an item from the buffer if one is available. If the buffer
113113
# is open and no item is available the calling thread will block
@@ -123,7 +123,7 @@ def take
123123
raise NotImplementedError
124124
end
125125

126-
# @!macro [attach] channel_buffer_next
126+
# @!macro channel_buffer_next
127127
#
128128
# Take the next "item" from the buffer and also return a boolean
129129
# indicating if "more" items can be taken. Used for iterating
@@ -152,7 +152,7 @@ def next
152152
raise NotImplementedError
153153
end
154154

155-
# @!macro [attach] channel_buffer_poll
155+
# @!macro channel_buffer_poll
156156
#
157157
# Take the next item from the buffer if one is available else return
158158
# immediately. Failing to return a value does not necessarily
@@ -166,7 +166,7 @@ def poll
166166
raise NotImplementedError
167167
end
168168

169-
# @!macro [attach] channel_buffer_close
169+
# @!macro channel_buffer_close
170170
#
171171
# Close the buffer, preventing new items from being added. Once a
172172
# buffer is closed it cannot be opened again.
@@ -179,7 +179,7 @@ def close
179179
end
180180
end
181181

182-
# @!macro [attach] channel_buffer_closed_question
182+
# @!macro channel_buffer_closed_question
183183
#
184184
# Predicate indicating is this buffer closed.
185185
#

lib-edge/concurrent/channel/buffer/unbuffered.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def poll
131131
# waiting to {#put} items onto the buffer. This method exhibits the
132132
# same blocking behavior as {#take}.
133133
#
134-
# @see {#take}
134+
# @see #take
135135
def next
136136
item = take
137137
more = (item != Concurrent::NULL)

lib-edge/concurrent/edge.rb

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,7 @@ module Concurrent
1515
# features should remain in this module until merged into the core gem. This
1616
# will prevent namespace collisions.
1717
#
18-
# @!macro [attach] warn.edge
19-
# @api Edge
20-
# @note **Edge Features** are under active development and may change frequently.
21-
#
22-
# - Deprecations are not added before incompatible changes.
23-
# - Edge version: _major_ is always 0, _minor_ bump means incompatible change,
24-
# _patch_ bump means compatible change.
25-
# - Edge features may also lack tests and documentation.
26-
# - Features developed in `concurrent-ruby-edge` are expected to move
27-
# to `concurrent-ruby` when finalised.
18+
# @!macro warn.edge
2819
module Edge
2920
end
3021
end

lib-edge/concurrent/edge/lock_free_linked_set.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ module Edge
2222
class LockFreeLinkedSet
2323
include Enumerable
2424

25-
# @!macro [attach] lock_free_linked_list_method_initialize
25+
# @!macro lock_free_linked_list_method_initialize
2626
#
27-
# @param [Fixnum] initial_size the size of the linked_list to initialize
27+
# @param [Fixnum] initial_size the size of the linked_list to initialize
2828
def initialize(initial_size = 0, val = nil)
2929
@head = Head.new
3030

@@ -34,7 +34,7 @@ def initialize(initial_size = 0, val = nil)
3434
end
3535
end
3636

37-
# @!macro [attach] lock_free_linked_list_method_add
37+
# @!macro lock_free_linked_list_method_add
3838
#
3939
# Atomically adds the item to the set if it does not yet exist. Note:
4040
# internally the set uses `Object#hash` to compare equality of items,
@@ -62,7 +62,7 @@ def add(item)
6262
end
6363
end
6464

65-
# @!macro [attach] lock_free_linked_list_method_<<
65+
# @!macro lock_free_linked_list_method_<<
6666
#
6767
# Atomically adds the item to the set if it does not yet exist.
6868
#
@@ -74,7 +74,7 @@ def <<(item)
7474
self
7575
end
7676

77-
# @!macro [attach] lock_free_linked_list_method_contains
77+
# @!macro lock_free_linked_list_method_contains
7878
#
7979
# Atomically checks to see if the set contains an item. This method
8080
# compares equality based on the `Object#hash` method, meaning that the
@@ -95,7 +95,7 @@ def contains?(item)
9595
curr == item && !marked
9696
end
9797

98-
# @!macro [attach] lock_free_linked_list_method_remove
98+
# @!macro lock_free_linked_list_method_remove
9999
#
100100
# Atomically attempts to remove an item, comparing using `Object#hash`.
101101
#
@@ -121,7 +121,7 @@ def remove(item)
121121
end
122122
end
123123

124-
# @!macro [attach] lock_free_linked_list_method_each
124+
# @!macro lock_free_linked_list_method_each
125125
#
126126
# An iterator to loop through the set.
127127
#

0 commit comments

Comments
 (0)