Skip to content
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
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ The following default gems are updated.

The following bundled gems are updated.

* minitest 5.27.0
* minitest 6.0.0
* power_assert 3.0.1
* 2.0.5 to [v3.0.0][power_assert-v3.0.0], [v3.0.1][power_assert-v3.0.1]
* rake 13.3.1
Expand Down
4 changes: 2 additions & 2 deletions doc/language/globals.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require 'English'
| `$!` | `$ERROR_INFO` | \Exception object or `nil` | `nil` | Yes | Kernel#raise |
| `$@` | `$ERROR_POSITION` | \Array of backtrace positions or `nil` | `nil` | Yes | Kernel#raise |

### Regular Expression
### Matched \Data

| Variable | \English | Contains | Initially | Read-Only | Reset By |
|:-------------:|:-------------------:|-----------------------------------|:---------:|:---------:|-----------------|
Expand Down Expand Up @@ -127,7 +127,7 @@ Output:

English - `$ERROR_POSITION`.

## Regular Expression
## Matched \Data

These global variables store information about the most recent
successful match in the current scope.
Expand Down
4 changes: 2 additions & 2 deletions doc/string/partition.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Note that in the examples below, a returned string <tt>'hello'</tt>
is a copy of +self+, not +self+.

If +pattern+ is a Regexp, performs the equivalent of <tt>self.match(pattern)</tt>
(also setting {pattern-matching global variables}[rdoc-ref:language/globals.md@Regular+Expression]):
(also setting {matched-data variables}[rdoc-ref:language/globals.md@Matched+Data]):

'hello'.partition(/h/) # => ["", "h", "ello"]
'hello'.partition(/l/) # => ["he", "l", "lo"]
Expand All @@ -30,7 +30,7 @@ If +pattern+ is a Regexp, performs the equivalent of <tt>self.match(pattern)</tt

If +pattern+ is not a Regexp, converts it to a string (if it is not already one),
then performs the equivalent of <tt>self.index(pattern)</tt>
(and does _not_ set {pattern-matching global variables}[rdoc-ref:language/globals.md@Regular+Expression]):
(and does _not_ set {matched-data global variables}[rdoc-ref:language/globals.md@Matched+Data]):

'hello'.partition('h') # => ["", "h", "ello"]
'hello'.partition('l') # => ["he", "l", "lo"]
Expand Down
4 changes: 2 additions & 2 deletions doc/string/rpartition.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The pattern used is:
Note that in the examples below, a returned string <tt>'hello'</tt> is a copy of +self+, not +self+.

If +pattern+ is a Regexp, searches for the last matching substring
(also setting {pattern-matching global variables}[rdoc-ref:language/globals.md@Regular+Expression]):
(also setting {matched-data global variables}[rdoc-ref:language/globals.md@Matched+Data]):

'hello'.rpartition(/l/) # => ["hel", "l", "o"]
'hello'.rpartition(/ll/) # => ["he", "ll", "o"]
Expand All @@ -36,7 +36,7 @@ If +pattern+ is a Regexp, searches for the last matching substring

If +pattern+ is not a Regexp, converts it to a string (if it is not already one),
then searches for the last matching substring
(and does _not_ set {pattern-matching global variables}[rdoc-ref:language/globals.md@Regular+Expression]):
(and does _not_ set {matched-data global variables}[rdoc-ref:language/globals.md@Matched+Data]):

'hello'.rpartition('l') # => ["hel", "l", "o"]
'hello'.rpartition('ll') # => ["he", "ll", "o"]
Expand Down
2 changes: 1 addition & 1 deletion gems/bundled_gems
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# - revision: revision in repository-url to test
# if `revision` is not given, "v"+`version` or `version` will be used.

minitest 5.27.0 https://github.com/minitest/minitest
minitest 6.0.0 https://github.com/minitest/minitest
power_assert 3.0.1 https://github.com/ruby/power_assert
rake 13.3.1 https://github.com/ruby/rake
test-unit 3.7.5 https://github.com/test-unit/test-unit
Expand Down
2 changes: 1 addition & 1 deletion tool/releng/gen-mail.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Confirm current directory is www.ruby-lang.org's working directory
def confirm_w_r_l_o_wd
File.foreach('.git/config') do |line|
return true if line.include?('git@github.com:ruby/www.ruby-lang.org.git')
return true if line.include?('ruby/www.ruby-lang.org.git')
end
abort "Run this script in www.ruby-lang.org's working directory"
end
Expand Down