diff options
| author | Orion Gonzalez <ardi@ardis.dev> | 2024-10-04 10:54:34 +0200 |
|---|---|---|
| committer | Orion Gonzalez <ardi@ardis.dev> | 2024-10-22 19:11:44 +0200 |
| commit | c8de61b50de7ca755b704c0314ff3a119be01ae6 (patch) | |
| tree | f406562df280bab60a73445acbf3b2d4b4856007 /src/tools | |
| parent | 37ffb94093828676d88178063c8930ea83a29386 (diff) | |
| download | rust-c8de61b50de7ca755b704c0314ff3a119be01ae6.tar.gz rust-c8de61b50de7ca755b704c0314ff3a119be01ae6.zip | |
s/display-diff-tool/compiletest-diff-tool/
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/common.rs | 1 | ||||
| -rw-r--r-- | src/tools/compiletest/src/lib.rs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs index 5e50e227ded..5070f016d3c 100644 --- a/src/tools/compiletest/src/common.rs +++ b/src/tools/compiletest/src/common.rs @@ -388,6 +388,7 @@ pub struct Config { /// Used by the "needs-profiler-runtime" directive in test files. pub profiler_runtime: bool, + /// Command for visual diff display, e.g. `diff-tool --color=always`. pub diff_command: Option<String>, } diff --git a/src/tools/compiletest/src/lib.rs b/src/tools/compiletest/src/lib.rs index a008410e34b..0f514db42bf 100644 --- a/src/tools/compiletest/src/lib.rs +++ b/src/tools/compiletest/src/lib.rs @@ -178,7 +178,7 @@ pub fn parse_config(args: Vec<String>) -> Config { ) .optopt( "", - "display-diff-tool", + "compiletest-diff-tool", "What custom diff tool to use for displaying compiletest tests.", "COMMAND", ); @@ -370,7 +370,7 @@ pub fn parse_config(args: Vec<String>) -> Config { git_merge_commit_email: matches.opt_str("git-merge-commit-email").unwrap(), profiler_runtime: matches.opt_present("profiler-runtime"), - diff_command: matches.opt_str("display-diff-tool"), + diff_command: matches.opt_str("compiletest-diff-tool"), } } |