Rename to artifact-dir in config.toml too

Author: valadaptive

src/bin/cargo/commands/build.rs

@@ -50,18 +50,44 @@ pub fn exec(gctx: &mut GlobalContext, args: &ArgMatches) -> CliResult {
     let mut compile_opts =
         args.compile_options(gctx, CompileMode::Build, Some(&ws), ProfileChecking::Custom)?;
 
-    let mut artifact_dir_arg = args.value_of_path("artifact-dir", gctx);
+    // If the user specifies `--artifact-dir`, use that
+    let mut artifact_dir = args.value_of_path("artifact-dir", gctx);
 
-    if artifact_dir_arg.is_none() {
+    // `--out-dir` is deprecated, but still supported for now
+    if artifact_dir.is_none() {
         let out_dir_arg = args.value_of_path("out-dir", gctx);
         if out_dir_arg.is_some() {
             gctx.shell()
                 .warn("the --out-dir flag has been changed to --artifact-dir")?;
         }
-        artifact_dir_arg = out_dir_arg
+        artifact_dir = out_dir_arg
     }
 
-    if let Some(artifact_dir) = artifact_dir_arg {
+    // If a CLI option is not specified for choosing the artifact dir, use the `artifact-dir` from the build config, if
+    // present
+    if artifact_dir.is_none() {
+        artifact_dir = gctx
+            .build_config()?
+            .artifact_dir
+            .as_ref()
+            .map(|path| path.resolve_path(gctx));
+    }
+
+    // As a last priority, check `out-dir` in the build config
+    if artifact_dir.is_none() {
+        let out_dir = gctx
+            .build_config()?
+            .out_dir
+            .as_ref()
+            .map(|path| path.resolve_path(gctx));
+        if out_dir.is_some() {
+            gctx.shell()
+                .warn("the out-dir config option has been changed to artifact-dir")?;
+        }
+        artifact_dir = out_dir;
+    }
+
+    if let Some(artifact_dir) = artifact_dir {
         compile_opts.build_config.export_dir = Some(artifact_dir);
     } else if let Some(out_dir) = gctx.build_config()?.out_dir.as_ref() {
         let artifact_dir = out_dir.resolve_path(gctx);

src/cargo/util/context/mod.rs

@@ -2577,7 +2577,9 @@ pub struct CargoBuildConfig {
     pub rustc_workspace_wrapper: Option<ConfigRelativePath>,
     pub rustc: Option<ConfigRelativePath>,
     pub rustdoc: Option<ConfigRelativePath>,
+    // deprecated alias for artifact-dir
     pub out_dir: Option<ConfigRelativePath>,
+    pub artifact_dir: Option<ConfigRelativePath>,
 }
 
 /// Configuration for `build.target`.