Skip to content

Commit

Permalink
Rollup merge of rust-lang#126536 - Rejyr:remove-unused-run-make-file,…
Browse files Browse the repository at this point in the history
… r=jieyouxu

Remove unused `llvm_readobj.rs` in `run-make-support`

`llvm_readobj.rs` seems unused from the migration to `llvm.rs` in rust-lang#125165.
Also, `llvm.rs` was missing the drop bombs (rust-lang#125752) in `llvm_readobj.rs`.

Part of rust-lang#121876.

r? `@jieyouxu`
  • Loading branch information
jieyouxu authored Jun 16, 2024
2 parents edfadbf + eb0bad4 commit 0ff790f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 45 deletions.
6 changes: 6 additions & 0 deletions src/tools/run-make-support/src/llvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@ use crate::{env_var, Command};

/// Construct a new `llvm-readobj` invocation. This assumes that `llvm-readobj` is available
/// at `$LLVM_BIN_DIR/llvm-readobj`.
#[track_caller]
pub fn llvm_readobj() -> LlvmReadobj {
LlvmReadobj::new()
}

/// Construct a new `llvm-profdata` invocation. This assumes that `llvm-profdata` is available
/// at `$LLVM_BIN_DIR/llvm-profdata`.
#[track_caller]
pub fn llvm_profdata() -> LlvmProfdata {
LlvmProfdata::new()
}

/// Construct a new `llvm-filecheck` invocation. This assumes that `llvm-filecheck` is available
/// at `$LLVM_FILECHECK`.
#[track_caller]
pub fn llvm_filecheck() -> LlvmFilecheck {
LlvmFilecheck::new()
}
Expand Down Expand Up @@ -55,6 +58,7 @@ pub fn llvm_bin_dir() -> PathBuf {
impl LlvmReadobj {
/// Construct a new `llvm-readobj` invocation. This assumes that `llvm-readobj` is available
/// at `$LLVM_BIN_DIR/llvm-readobj`.
#[track_caller]
pub fn new() -> Self {
let llvm_readobj = llvm_bin_dir().join("llvm-readobj");
let cmd = Command::new(llvm_readobj);
Expand All @@ -77,6 +81,7 @@ impl LlvmReadobj {
impl LlvmProfdata {
/// Construct a new `llvm-profdata` invocation. This assumes that `llvm-profdata` is available
/// at `$LLVM_BIN_DIR/llvm-profdata`.
#[track_caller]
pub fn new() -> Self {
let llvm_profdata = llvm_bin_dir().join("llvm-profdata");
let cmd = Command::new(llvm_profdata);
Expand Down Expand Up @@ -107,6 +112,7 @@ impl LlvmProfdata {
impl LlvmFilecheck {
/// Construct a new `llvm-filecheck` invocation. This assumes that `llvm-filecheck` is available
/// at `$LLVM_FILECHECK`.
#[track_caller]
pub fn new() -> Self {
let llvm_filecheck = env_var("LLVM_FILECHECK");
let cmd = Command::new(llvm_filecheck);
Expand Down
45 changes: 0 additions & 45 deletions src/tools/run-make-support/src/llvm_readobj.rs

This file was deleted.

0 comments on commit 0ff790f

Please sign in to comment.