diff options
author | Kazuhiro NISHIYAMA <zn@mbf.nifty.com> | 2022-04-22 13:41:18 +0900 |
---|---|---|
committer | Kazuhiro NISHIYAMA <znz@users.noreply.github.com> | 2022-04-23 11:59:20 +0900 |
commit | e142bea7997eeb9c8e902089ce0a68138da8abc3 (patch) | |
tree | 58d8de8dd4aa8939ffd930fc9b1fa04a0e260b52 | |
parent | ab3cb29bd9bff9c16cfb9d19cc02026998282c12 (diff) |
Remove unnecessary sort
Because `Dir.[]` returns the sorted results since Ruby 3.0.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5832
-rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 547a28577e..aba78dfb56 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2280,7 +2280,7 @@ RULES RbConfig.expand(srcdir = srcprefix.dup) ext = ".#{$OBJEXT}" - orig_srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].sort + orig_srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")] if not $objs srcs = $srcs || orig_srcs $objs = [] @@ -2290,7 +2290,7 @@ RULES h } unless objs.delete_if {|b, f| f.size == 1}.empty? - dups = objs.sort.map {|b, f| + dups = objs.map {|b, f| "#{b[/.*\./]}{#{f.collect {|n| n[/([^.]+)\z/]}.join(',')}}" } abort "source files duplication - #{dups.join(", ")}" |