Skip to content

Commit cb1acbd

Browse files
authored
Unrolled build for rust-lang#126536
Rollup merge of rust-lang#126536 - Rejyr:remove-unused-run-make-file, 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`
2 parents 55cac26 + eb0bad4 commit cb1acbd

File tree

2 files changed

+6
-45
lines changed

2 files changed

+6
-45
lines changed

src/tools/run-make-support/src/llvm.rs

+6
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@ use crate::{env_var, Command};
44

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

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

1719
/// Construct a new `llvm-filecheck` invocation. This assumes that `llvm-filecheck` is available
1820
/// at `$LLVM_FILECHECK`.
21+
#[track_caller]
1922
pub fn llvm_filecheck() -> LlvmFilecheck {
2023
LlvmFilecheck::new()
2124
}
@@ -55,6 +58,7 @@ pub fn llvm_bin_dir() -> PathBuf {
5558
impl LlvmReadobj {
5659
/// Construct a new `llvm-readobj` invocation. This assumes that `llvm-readobj` is available
5760
/// at `$LLVM_BIN_DIR/llvm-readobj`.
61+
#[track_caller]
5862
pub fn new() -> Self {
5963
let llvm_readobj = llvm_bin_dir().join("llvm-readobj");
6064
let cmd = Command::new(llvm_readobj);
@@ -77,6 +81,7 @@ impl LlvmReadobj {
7781
impl LlvmProfdata {
7882
/// Construct a new `llvm-profdata` invocation. This assumes that `llvm-profdata` is available
7983
/// at `$LLVM_BIN_DIR/llvm-profdata`.
84+
#[track_caller]
8085
pub fn new() -> Self {
8186
let llvm_profdata = llvm_bin_dir().join("llvm-profdata");
8287
let cmd = Command::new(llvm_profdata);
@@ -107,6 +112,7 @@ impl LlvmProfdata {
107112
impl LlvmFilecheck {
108113
/// Construct a new `llvm-filecheck` invocation. This assumes that `llvm-filecheck` is available
109114
/// at `$LLVM_FILECHECK`.
115+
#[track_caller]
110116
pub fn new() -> Self {
111117
let llvm_filecheck = env_var("LLVM_FILECHECK");
112118
let cmd = Command::new(llvm_filecheck);

src/tools/run-make-support/src/llvm_readobj.rs

-45
This file was deleted.

0 commit comments

Comments
 (0)