From ec1727a1bed5c431941972aeae064b6345e51321 Mon Sep 17 00:00:00 2001 From: Jack Nagel <jacknagel@gmail.com> Date: Fri, 19 Jun 2015 22:17:29 -0400 Subject: [PATCH] Remove backports for Ruby 1.8.6 refs. Homebrew/linuxbrew#438, mistydemeo/tigerbrew#327, mistydemeo/tigerbrew#334 --- Library/Homebrew/extend/enumerable.rb | 7 ------- Library/Homebrew/extend/string.rb | 27 --------------------------- Library/Homebrew/extend/symbol.rb | 5 ----- Library/Homebrew/global.rb | 2 -- 4 files changed, 41 deletions(-) delete mode 100644 Library/Homebrew/extend/enumerable.rb delete mode 100644 Library/Homebrew/extend/symbol.rb diff --git a/Library/Homebrew/extend/enumerable.rb b/Library/Homebrew/extend/enumerable.rb deleted file mode 100644 index f6765bbae9..0000000000 --- a/Library/Homebrew/extend/enumerable.rb +++ /dev/null @@ -1,7 +0,0 @@ -module Enumerable - def group_by - inject({}) do |h, e| - h.fetch(yield(e)) { |k| h[k] = [] } << e; h - end - end unless method_defined?(:group_by) -end diff --git a/Library/Homebrew/extend/string.rb b/Library/Homebrew/extend/string.rb index c921a2a7da..17575ca8e9 100644 --- a/Library/Homebrew/extend/string.rb +++ b/Library/Homebrew/extend/string.rb @@ -15,33 +15,6 @@ class String # EOS alias_method :undent_________________________________________________________72, :undent - def start_with?(*prefixes) - prefixes.any? do |prefix| - if prefix.respond_to?(:to_str) - prefix = prefix.to_str - self[0, prefix.length] == prefix - end - end - end unless method_defined?(:start_with?) - - def end_with?(*suffixes) - suffixes.any? do |suffix| - if suffix.respond_to?(:to_str) - suffix = suffix.to_str - self[-suffix.length, suffix.length] == suffix - end - end - end unless method_defined?(:end_with?) - - # 1.8.7 or later; used in bottle code - def rpartition(separator) - if ind = rindex(separator) - [slice(0, ind), separator, slice(ind+1, -1) || ''] - else - ['', '', dup] - end - end unless method_defined?(:rpartition) - # String.chomp, but if result is empty: returns nil instead. # Allows `chuzzle || foo` short-circuits. def chuzzle diff --git a/Library/Homebrew/extend/symbol.rb b/Library/Homebrew/extend/symbol.rb deleted file mode 100644 index 18ccb31474..0000000000 --- a/Library/Homebrew/extend/symbol.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Symbol - def to_proc - proc { |*args| args.shift.send(self, *args) } - end unless method_defined?(:to_proc) -end diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 2c71b473f4..ba79f40d6e 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -3,8 +3,6 @@ require 'extend/fileutils' require 'extend/pathname' require 'extend/ARGV' require 'extend/string' -require 'extend/symbol' -require 'extend/enumerable' require 'os' require 'utils' require 'exceptions' -- GitLab