Skip to content

Commit

Permalink
Unrolled build for rust-lang#127359
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127359 - GuillaumeGomez:improve-run-make-llvm-ident-code, r=jieyouxu

Improve run make llvm ident code

I took the commits that are not blocking rust-lang#127237.

r? `@Kobzol`
  • Loading branch information
rust-timer committed Jul 5, 2024
2 parents 2ad6630 + 415e202 commit c394217
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/tools/run-make-support/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ impl Command {
/// Generic command arguments provider. Prefer specific helper methods if possible.
/// Note that for some executables, arguments might be platform specific. For C/C++
/// compilers, arguments might be platform *and* compiler specific.
pub fn args<S>(&mut self, args: &[S]) -> &mut Self
pub fn args<S, V>(&mut self, args: V) -> &mut Self
where
S: AsRef<ffi::OsStr>,
V: AsRef<[S]>,
{
self.cmd.args(args);
self.cmd.args(args.as_ref());
self
}

Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/llvm-ident/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fn main() {
files.push(path.to_path_buf());
}
});
cmd(llvm_bin_dir().join("llvm-dis")).args(&files).run();
cmd(llvm_bin_dir().join("llvm-dis")).args(files).run();

// Check LLVM IR files (including temporary outputs) have `!llvm.ident`
// named metadata, reusing the related codegen test.
Expand Down

0 comments on commit c394217

Please sign in to comment.