ruby-changes:74157
From: nagachika <ko1@a...>
Date: Fri, 21 Oct 2022 14:02:44 +0900 (JST)
Subject: [ruby-changes:74157] 82b6b9c512 (ruby_3_1): merge revision(s) 6946263a2994257c6240e52a365700dc573c7ed4:
https://git.ruby-lang.org/ruby.git/commit/?id=82b6b9c512 From 82b6b9c5124c446c64a5cca144abdcf933e7774f Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Fri, 21 Oct 2022 13:39:45 +0900 Subject: merge revision(s) 6946263a2994257c6240e52a365700dc573c7ed4: [DOC] make internally used classes/methods nodoc Empty class documents are generated even with `:stopdoc:`. --- lib/mkmf.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) --- lib/mkmf.rb | 18 ++++++------------ version.h | 2 +- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index dc43aaebf7..ff854b3c30 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -7,9 +7,7 @@ require 'rbconfig' https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L7 require 'fileutils' require 'shellwords' -class String - # :stopdoc: - +class String # :nodoc: # Wraps a string in escaped quotes if it contains whitespace. def quote /\s/ =~ self ? "\"#{self}\"" : "#{self}" @@ -32,19 +30,13 @@ class String https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L30 def sans_arguments self[/\A[^()]+/] end - - # :startdoc: end -class Array - # :stopdoc: - +class Array # :nodoc: # Wraps all strings in escaped quotes if they contain whitespace. def quote map {|s| s.quote} end - - # :startdoc: end ## @@ -1364,8 +1356,10 @@ SRC https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1356 # :stopdoc: STRING_OR_FAILED_FORMAT = "%s" - def STRING_OR_FAILED_FORMAT.%(x) # :nodoc: - x ? super : "failed" + class << STRING_OR_FAILED_FORMAT # :nodoc: + def %(x) + x ? super : "failed" + end end def typedef_expr(type, headers) diff --git a/version.h b/version.h index 504a0b262f..44e0002976 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 127 +#define RUBY_PATCHLEVEL 128 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/