Merge pull request #140980 from ZhongRuoyu/rust-conflicts

rust rust-analyzer rustfmt: remove conflicts
Homebrew · Aug 31, 2023 · 88e0728 · 88e0728
2 parents 68d5efc + 5555e24
commit 88e0728
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/Formula/r/rust-analyzer.rb b/Formula/r/rust-analyzer.rb
@@ -19,8 +19,6 @@ class RustAnalyzer < Formula
 
   depends_on "rust" => :build
 
-  conflicts_with "rust", because: "both install `rust-analyzer` binary"
-
   def install
     cd "crates/rust-analyzer" do
       system "cargo", "install", "--bin", "rust-analyzer", *std_cargo_args

diff --git a/Formula/r/rust.rb b/Formula/r/rust.rb
@@ -55,9 +55,6 @@ class Rust < Formula
   uses_from_macos "curl"
   uses_from_macos "zlib"
 
-  conflicts_with "rust-analyzer", because: "both install `rust-analyzer` binary"
-  conflicts_with "rustfmt", because: "both install `cargo-fmt` and `rustfmt` binaries"
-
   # From https://github.com/rust-lang/rust/blob/#{version}/src/stage0.json
   resource "cargobootstrap" do
     on_macos do

diff --git a/Formula/r/rustfmt.rb b/Formula/r/rustfmt.rb
@@ -21,8 +21,6 @@ class Rustfmt < Formula
   depends_on "rustup-init" => :build
   depends_on "rust" => :test
 
-  conflicts_with "rust", because: "both install `cargo-fmt` and `rustfmt` binaries"
-
   def install
     system "#{Formula["rustup-init"].bin}/rustup-init", "-qy", "--no-modify-path"
     ENV.prepend_path "PATH", HOMEBREW_CACHE/"cargo_cache/bin"