From f52938e4a958f367c197d7f5c95beba8acd0c9bf Mon Sep 17 00:00:00 2001 From: Branch Vincent Date: Sun, 21 Jul 2024 13:02:33 -0700 Subject: [PATCH] cargo-fuzz: use `rustup` --- Formula/c/cargo-fuzz.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Formula/c/cargo-fuzz.rb b/Formula/c/cargo-fuzz.rb index ddd04c709184..466919f404a4 100644 --- a/Formula/c/cargo-fuzz.rb +++ b/Formula/c/cargo-fuzz.rb @@ -16,7 +16,7 @@ class CargoFuzz < Formula end depends_on "rust" => :build - depends_on "rustup-init" => :test + depends_on "rustup" => :test def install system "cargo", "install", *std_cargo_args @@ -25,10 +25,9 @@ def install test do # Show that we can use a different toolchain than the one provided by the `rust` formula. # https://github.com/Homebrew/homebrew-core/pull/134074#pullrequestreview-1484979359 - ENV["RUSTUP_INIT_SKIP_PATH_CHECK"] = "yes" - rustup_init = Formula["rustup-init"].bin/"rustup-init" - system rustup_init, "-y", "--profile", "minimal", "--default-toolchain", "beta", "--no-modify-path" - ENV.prepend_path "PATH", HOMEBREW_CACHE/"cargo_cache/bin" + ENV.prepend_path "PATH", Formula["rustup"].bin + system "rustup", "default", "beta" + system "rustup", "set", "profile", "minimal" system "cargo", "init" system "#{bin}/cargo-fuzz", "init"