formula: add std_cargo_args

Homebrew · Jun 22, 2020 · 8a62f89 · 8a62f89
1 parent a89b565
commit 8a62f89
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
@@ -1354,6 +1354,11 @@ def inspect
     "#<Formula #{name} (#{active_spec_sym}) #{path}>"
   end
 
+  # Standard parameters for cargo builds.
+  def std_cargo_args
+    ["--locked", "--root", prefix, "--path", "."]
+  end
+
   # Standard parameters for CMake builds.
   # Setting `CMAKE_FIND_FRAMEWORK` to "LAST" tells CMake to search for our
   # libraries before trying to utilize Frameworks, many of which will be from
@@ -1930,6 +1935,8 @@ def system(cmd, *args)
       case cmd
       when "./configure"
         pretty_args -= %w[--disable-dependency-tracking --disable-debug --disable-silent-rules]
+      when "cargo"
+        pretty_args -= std_cargo_args
       when "cmake"
         pretty_args -= std_cmake_args
       when "go"

diff --git a/Library/Homebrew/formula_creator.rb b/Library/Homebrew/formula_creator.rb
@@ -175,7 +175,7 @@ def install
             bin.install libexec/"bin/\#{name}"
             bin.env_script_all_files(libexec/"bin", :GEM_HOME => ENV["GEM_HOME"])
         <% elsif mode == :rust %>
-            system "cargo", "install", "--locked", "--root", prefix, "--path", "."
+            system "cargo", "install", *std_cargo_args
         <% else %>
             # Remove unrecognized options if warned by configure
             system "./configure", "--disable-debug",

diff --git a/Library/Homebrew/rubocops/text.rb b/Library/Homebrew/rubocops/text.rb
@@ -60,7 +60,7 @@ def audit_formula(_node, _class_node, _parent_class_node, body_node)
           end
 
           find_method_with_args(body_node, :system, "cargo", "build") do
-            problem "use \"cargo\", \"install\", \"--root\", prefix, \"--path\", \".\""
+            problem "use \"cargo\", \"install\", *std_cargo_args"
           end
         end
       end

diff --git a/Library/Homebrew/test/rubocops/text_spec.rb b/Library/Homebrew/test/rubocops/text_spec.rb
@@ -210,7 +210,7 @@ class Foo < Formula
 
           def install
             system "cargo", "build"
-            ^^^^^^^^^^^^^^^^^^^^^^^ use \"cargo\", \"install\", \"--root\", prefix, \"--path\", \".\"
+            ^^^^^^^^^^^^^^^^^^^^^^^ use \"cargo\", \"install\", *std_cargo_args
           end
         end
       RUBY