Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rust rust-analyzer rustfmt: remove conflicts #140980

Merged
merged 3 commits into from
Aug 31, 2023
Merged

rust rust-analyzer rustfmt: remove conflicts #140980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2e9734
rust: remove conflicts with `rust-analyzer` and `rustfmt`
ZhongRuoyu Aug 31, 2023
6b0ca69
rust-analyzer: remove conflict with `rust`
ZhongRuoyu Aug 31, 2023
5555e24
rustfmt: remove conflict with `rust`
ZhongRuoyu Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Formula/r/rust-analyzer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions Formula/r/rust.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions Formula/r/rustfmt.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading