Fix some incorrect replacements in rustc args

rust-lang · May 4, 2024 · 6737e08 · 6737e08
1 parent 27e81bc
commit 6737e08
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 37 deletions.
diff --git a/crates/rustfix/tests/parse_and_replace.rs b/crates/rustfix/tests/parse_and_replace.rs
@@ -53,7 +53,7 @@ fn compile(file: &Path) -> Result<Output, Error> {
         "--error-format=json".into(),
         "--emit=metadata".into(),
         "--crate-name=rustfix_test".into(),
-        "--artifact-dir".into(),
+        "--out-dir".into(),
         tmp.path().into(),
     ];
 

diff --git a/crates/semver-check/src/main.rs b/crates/semver-check/src/main.rs
@@ -190,7 +190,7 @@ fn compile(
         crate_type,
         "--crate-name",
         crate_name,
-        "--artifact-dir",
+        "--out-dir",
     ]);
     cmd.arg(&out_dir);
     if extern_path {

diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs
@@ -1137,7 +1137,7 @@ fn build_base_args(
         cmd.arg("-C").arg("rpath");
     }
 
-    cmd.arg("--artifact-dir")
+    cmd.arg("--out-dir")
         .arg(&build_runner.files().out_dir(unit));
 
     fn opt(cmd: &mut ProcessBuilder, key: &str, prefix: &str, val: Option<&OsStr>) {

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
@@ -1512,14 +1512,14 @@ fn cargo_default_env_metadata_env_var() {
         --emit=[..]link \
         -C prefer-dynamic[..]-C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [COMPILING] foo v0.0.1 ([CWD])
 [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib \
         --emit=[..]link[..]-C debuginfo=2 [..]\
         -C metadata=[..] \
         -C extra-filename=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps \
         --extern bar=[CWD]/target/debug/deps/{prefix}bar{suffix}`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]",
@@ -1540,14 +1540,14 @@ fn cargo_default_env_metadata_env_var() {
         --emit=[..]link \
         -C prefer-dynamic[..]-C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [COMPILING] foo v0.0.1 ([CWD])
 [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib \
         --emit=[..]link[..]-C debuginfo=2 [..]\
         -C metadata=[..] \
         -C extra-filename=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps \
         --extern bar=[CWD]/target/debug/deps/{prefix}bar-[..]{suffix}`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
@@ -2294,7 +2294,7 @@ fn verbose_build() {
 [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib \
         --emit=[..]link[..]-C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
 ",
@@ -2313,7 +2313,7 @@ fn verbose_release_build() {
         --emit=[..]link[..]\
         -C opt-level=3[..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/release/deps`
 [FINISHED] `release` profile [optimized] target(s) in [..]
 ",
@@ -2332,7 +2332,7 @@ fn verbose_release_build_short() {
         --emit=[..]link[..]\
         -C opt-level=3[..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/release/deps`
 [FINISHED] `release` profile [optimized] target(s) in [..]
 ",
@@ -2386,14 +2386,14 @@ fn verbose_release_build_deps() {
         -C prefer-dynamic[..]\
         -C opt-level=3[..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/release/deps`
 [COMPILING] test v0.0.0 ([CWD])
 [RUNNING] `rustc --crate-name test --edition=2015 src/lib.rs [..]--crate-type lib \
         --emit=[..]link[..]\
         -C opt-level=3[..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/release/deps \
         --extern foo=[CWD]/target/release/deps/{prefix}foo{suffix} \
         --extern foo=[CWD]/target/release/deps/libfoo.rlib`
@@ -6282,7 +6282,7 @@ fn build_lib_only() {
 [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib \
         --emit=[..]link[..]-C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]",
         )

diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
@@ -1827,19 +1827,19 @@ fn build_cmd_with_a_build_cmd() {
 [RUNNING] `rustc --crate-name a [..]lib.rs [..]--crate-type lib \
     --emit=[..]link[..] \
     -C metadata=[..] \
-    --artifact-dir [..]target/debug/deps \
+    --out-dir [..]target/debug/deps \
     -L [..]target/debug/deps`
 [COMPILING] foo v0.5.0 ([CWD])
 [RUNNING] `rustc --crate-name build_script_build --edition=2015 build.rs [..]--crate-type bin \
     --emit=[..]link[..]\
-    -C metadata=[..] --artifact-dir [..] \
+    -C metadata=[..] --out-dir [..] \
     -L [..]target/debug/deps \
     --extern a=[..]liba[..].rlib`
 [RUNNING] `[..]/foo-[..]/build-script-build`
 [RUNNING] `rustc --crate-name foo [..]lib.rs [..]--crate-type lib \
     --emit=[..]link[..]-C debuginfo=2 [..]\
     -C metadata=[..] \
-    --artifact-dir [..] \
+    --out-dir [..] \
     -L [..]target/debug/deps`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
 ",

diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs
@@ -406,7 +406,7 @@ fn linker() {
 [RUNNING] `rustc --crate-name foo --edition=2015 src/foo.rs [..]--crate-type bin \
     --emit=[..]link[..]-C debuginfo=2 [..]\
     -C metadata=[..] \
-    --artifact-dir [CWD]/target/{target}/debug/deps \
+    --out-dir [CWD]/target/{target}/debug/deps \
     --target {target} \
     -C linker=my-linker-tool \
     -L dependency=[CWD]/target/{target}/debug/deps \
@@ -662,7 +662,7 @@ fn cross_with_a_build_script() {
         .with_stderr(&format!(
             "\
 [COMPILING] foo v0.0.0 ([CWD])
-[RUNNING] `rustc [..] build.rs [..] --artifact-dir [CWD]/target/debug/build/foo-[..]`
+[RUNNING] `rustc [..] build.rs [..] --out-dir [CWD]/target/debug/build/foo-[..]`
 [RUNNING] `[CWD]/target/debug/build/foo-[..]/build-script-build`
 [RUNNING] `rustc [..] src/main.rs [..] --target {target} [..]`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
@@ -762,7 +762,7 @@ fn build_script_needed_for_host_and_target() {
         .arg(&target)
         .with_stderr_contains(&"[COMPILING] d1 v0.0.0 ([CWD]/d1)")
         .with_stderr_contains(
-            "[RUNNING] `rustc [..] d1/build.rs [..] --artifact-dir [CWD]/target/debug/build/d1-[..]`",
+            "[RUNNING] `rustc [..] d1/build.rs [..] --out-dir [CWD]/target/debug/build/d1-[..]`",
         )
         .with_stderr_contains("[RUNNING] `[CWD]/target/debug/build/d1-[..]/build-script-build`")
         .with_stderr_contains("[RUNNING] `rustc [..] d1/src/lib.rs [..]`")
@@ -773,7 +773,7 @@ fn build_script_needed_for_host_and_target() {
         ))
         .with_stderr_contains("[COMPILING] foo v0.0.0 ([CWD])")
         .with_stderr_contains(&format!(
-            "[RUNNING] `rustc [..] build.rs [..] --artifact-dir [CWD]/target/debug/build/foo-[..] \
+            "[RUNNING] `rustc [..] build.rs [..] --out-dir [CWD]/target/debug/build/foo-[..] \
              -L /path/to/{host}`",
             host = host
         ))

diff --git a/tests/testsuite/freshness.rs b/tests/testsuite/freshness.rs
@@ -1773,7 +1773,7 @@ fn dirty_both_lib_and_test() {
                         Command::new(rustc)
                             .args(&[
                                 "--crate-type=staticlib",
-                                "--artifact-dir",
+                                "--out-dir",
                                 out_dir.to_str().unwrap(),
                                 "slib.rs"
                             ])

diff --git a/tests/testsuite/profiles.rs b/tests/testsuite/profiles.rs
@@ -35,7 +35,7 @@ fn profile_overrides() {
         -C debug-assertions=on[..] \
         -C metadata=[..] \
         -C rpath \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [FINISHED] `dev` profile [optimized] target(s) in [..]
 ",
@@ -70,7 +70,7 @@ fn opt_level_override_0() {
         --emit=[..]link[..]\
         -C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [FINISHED] [..] target(s) in [..]
 ",
@@ -104,7 +104,7 @@ fn debug_override_1() {
         --emit=[..]link[..]\
         -C debuginfo=1 [..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [FINISHED] [..] target(s) in [..]
 ",
@@ -143,7 +143,7 @@ fn check_opt_level_override(profile_level: &str, rustc_level: &str) {
         -C debuginfo=2 [..]\
         -C debug-assertions=on[..] \
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [FINISHED] [..] target(s) in [..]
 ",
@@ -220,15 +220,15 @@ fn top_level_overrides_deps() {
         -C opt-level=1[..]\
         -C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [CWD]/target/release/deps \
+        --out-dir [CWD]/target/release/deps \
         -L dependency=[CWD]/target/release/deps`
 [COMPILING] test v0.0.0 ([CWD])
 [RUNNING] `rustc --crate-name test --edition=2015 src/lib.rs [..]--crate-type lib \
         --emit=[..]link \
         -C opt-level=1[..]\
         -C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/release/deps \
         --extern foo=[CWD]/target/release/deps/\
                      {prefix}foo[..]{suffix} \

diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs
@@ -798,15 +798,15 @@ fn example_with_release_flag() {
         --emit=[..]link \
         -C opt-level=3[..]\
         -C metadata=[..] \
-        --artifact-dir [CWD]/target/release/deps \
+        --out-dir [CWD]/target/release/deps \
         -C strip=debuginfo \
         -L dependency=[CWD]/target/release/deps`
 [COMPILING] foo v0.0.1 ([CWD])
 [RUNNING] `rustc --crate-name a --edition=2015 examples/a.rs [..]--crate-type bin \
         --emit=[..]link \
         -C opt-level=3[..]\
         -C metadata=[..] \
-        --artifact-dir [CWD]/target/release/examples \
+        --out-dir [CWD]/target/release/examples \
         -C strip=debuginfo \
         -L dependency=[CWD]/target/release/deps \
          --extern bar=[CWD]/target/release/deps/libbar-[..].rlib`
@@ -829,14 +829,14 @@ fast2",
         --emit=[..]link[..]\
         -C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [CWD]/target/debug/deps \
+        --out-dir [CWD]/target/debug/deps \
         -L dependency=[CWD]/target/debug/deps`
 [COMPILING] foo v0.0.1 ([CWD])
 [RUNNING] `rustc --crate-name a --edition=2015 examples/a.rs [..]--crate-type bin \
         --emit=[..]link[..]\
         -C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [CWD]/target/debug/examples \
+        --out-dir [CWD]/target/debug/examples \
         -L dependency=[CWD]/target/debug/deps \
          --extern bar=[CWD]/target/debug/deps/libbar-[..].rlib`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]

diff --git a/tests/testsuite/rustc.rs b/tests/testsuite/rustc.rs
@@ -20,7 +20,7 @@ fn build_lib_for_foo() {
 [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib \
         --emit=[..]link[..]-C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
 ",
@@ -43,7 +43,7 @@ fn lib() {
         --emit=[..]link[..]-C debuginfo=2 [..]\
         -C debug-assertions=off[..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
 ",
@@ -65,13 +65,13 @@ fn build_main_and_allow_unstable_options() {
 [RUNNING] `rustc --crate-name {name} --edition=2015 src/lib.rs [..]--crate-type lib \
         --emit=[..]link[..]-C debuginfo=2 [..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps`
 [RUNNING] `rustc --crate-name {name} --edition=2015 src/main.rs [..]--crate-type bin \
         --emit=[..]link[..]-C debuginfo=2 [..]\
         -C debug-assertions[..]\
         -C metadata=[..] \
-        --artifact-dir [..] \
+        --out-dir [..] \
         -L dependency=[CWD]/target/debug/deps \
         --extern {name}=[CWD]/target/debug/deps/lib{name}-[..].rlib`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
@@ -110,7 +110,7 @@ fn build_with_args_to_one_of_multiple_binaries() {
 [COMPILING] foo v0.0.1 ([CWD])
 [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..]\
         -C debuginfo=2 [..]-C metadata=[..] \
-        --artifact-dir [..]`
+        --out-dir [..]`
 [RUNNING] `rustc --crate-name bar --edition=2015 src/bin/bar.rs [..]--crate-type bin --emit=[..]link[..]\
         -C debuginfo=2 [..]-C debug-assertions [..]`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
@@ -388,7 +388,7 @@ fn build_with_args_to_one_of_multiple_tests() {
 [COMPILING] foo v0.0.1 ([CWD])
 [RUNNING] `rustc --crate-name foo --edition=2015 src/lib.rs [..]--crate-type lib --emit=[..]link[..]\
         -C debuginfo=2 [..]-C metadata=[..] \
-        --artifact-dir [..]`
+        --out-dir [..]`
 [RUNNING] `rustc --crate-name bar --edition=2015 tests/bar.rs [..]--emit=[..]link[..]-C debuginfo=2 [..]\
         -C debug-assertions [..]--test[..]`
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]