diff options
| author | Mike McQuaid | 2016-09-18 13:28:15 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-18 13:28:15 +0100 |
| commit | 59b7f16bfd9c1968aae0a2f1cd9a43d3d160d99f (patch) | |
| tree | 17d2adec882cdeef36a8fd40d891fe7fe4021572 /Library/Homebrew/compilers.rb | |
| parent | 56541001a45ea58c54096bc42584c17d72b1415a (diff) | |
| parent | 1bdbb0f462e4c3557bbcba0b203696bdcf025bb4 (diff) | |
| download | brew-59b7f16bfd9c1968aae0a2f1cd9a43d3d160d99f.tar.bz2 | |
Merge pull request #989 from MikeMcQuaid/rubocop-final
Rubocop: apply auto-corrections and don't use hash-rockets
Diffstat (limited to 'Library/Homebrew/compilers.rb')
| -rw-r--r-- | Library/Homebrew/compilers.rb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb index b8bc708fa..940566643 100644 --- a/Library/Homebrew/compilers.rb +++ b/Library/Homebrew/compilers.rb @@ -1,12 +1,12 @@ # @private module CompilerConstants - GNU_GCC_VERSIONS = %w[4.3 4.4 4.5 4.6 4.7 4.8 4.9 5 6 7] + GNU_GCC_VERSIONS = %w[4.3 4.4 4.5 4.6 4.7 4.8 4.9 5 6 7].freeze GNU_GCC_REGEXP = /^gcc-(4\.[3-9]|[5-7])$/ COMPILER_SYMBOL_MAP = { "gcc-4.0" => :gcc_4_0, "gcc-4.2" => :gcc, "clang" => :clang, - } + }.freeze COMPILERS = COMPILER_SYMBOL_MAP.values + GNU_GCC_VERSIONS.map { |n| "gcc-#{n}" } @@ -58,19 +58,19 @@ class CompilerFailure end COLLECTIONS = { - :cxx11 => [ + cxx11: [ create(:gcc_4_0), create(:gcc), create(:clang) { build 425 }, - create(:gcc => "4.3"), - create(:gcc => "4.4"), - create(:gcc => "4.5"), - create(:gcc => "4.6"), + create(gcc: "4.3"), + create(gcc: "4.4"), + create(gcc: "4.5"), + create(gcc: "4.6"), ], - :openmp => [ + openmp: [ create(:clang), ], - } + }.freeze end class CompilerSelector @@ -79,10 +79,10 @@ class CompilerSelector Compiler = Struct.new(:name, :version) COMPILER_PRIORITY = { - :clang => [:clang, :gcc, :gnu, :gcc_4_0], - :gcc => [:gcc, :gnu, :clang, :gcc_4_0], - :gcc_4_0 => [:gcc_4_0, :gcc, :gnu, :clang], - } + clang: [:clang, :gcc, :gnu, :gcc_4_0], + gcc: [:gcc, :gnu, :clang, :gcc_4_0], + gcc_4_0: [:gcc_4_0, :gcc, :gnu, :clang], + }.freeze def self.select_for(formula, compilers = self.compilers) new(formula, DevelopmentTools, compilers).compiler @@ -103,7 +103,7 @@ class CompilerSelector def compiler find_compiler { |c| return c.name unless fails_with?(c) } - raise CompilerSelectionError.new(formula) + raise CompilerSelectionError, formula end private |
