fix(publish): Don't generate final artifacts

Author: epage

src/cargo/ops/cargo_package/mod.rs

@@ -160,7 +160,7 @@ fn create_package(
     }
 
     let filename = pkg.package_id().tarball_name();
-    let dir = ws.target_dir().join("package");
+    let dir = ws.build_dir().join("package");
     let mut dst = {
         let tmp = format!(".{}", filename);
         dir.open_rw_exclusive_create(&tmp, gctx, "package scratch space")?
@@ -220,7 +220,22 @@ pub fn package(ws: &Workspace<'_>, opts: &PackageOpts<'_>) -> CargoResult<Vec<Fi
     let packaged = do_package(ws, opts, pkgs)?;
 
     let mut result = Vec::new();
-    result.extend(packaged.into_iter().map(|(_, _, src)| src));
+    let target_dir = ws.target_dir();
+    let build_dir = ws.build_dir();
+    if target_dir == build_dir {
+        result.extend(packaged.into_iter().map(|(_, _, src)| src));
+    } else {
+        // Uplifting artifacts
+        let artifact_dir = target_dir.join("package");
+        for (pkg, _, src) in packaged {
+            let filename = pkg.package_id().tarball_name();
+            let dst =
+                artifact_dir.open_rw_exclusive_create(filename, ws.gctx(), "uplifted package")?;
+            src.file().seek(SeekFrom::Start(0))?;
+            std::io::copy(&mut src.file(), &mut dst.file())?;
+            result.push(dst);
+        }
+    }
 
     Ok(result)
 }

src/doc/src/reference/build-cache.md

@@ -62,7 +62,7 @@ the `target` directory:
 Directory | Description
 ----------|------------
 <code style="white-space: nowrap">target/doc/</code> | Contains rustdoc documentation ([`cargo doc`]).
-<code style="white-space: nowrap">target/package/</code> | Contains the output of the [`cargo package`] and [`cargo publish`] commands.
+<code style="white-space: nowrap">target/package/</code> | Contains the output of the [`cargo package`].
 
 Cargo also creates several other directories and files in the build-dir needed for the build
 process. The build-dir layout is considered internal to Cargo, and is subject to

tests/testsuite/build_dir.rs

@@ -384,9 +384,7 @@ fn cargo_publish_should_only_touch_build_dir() {
     assert_build_dir_layout(p.root().join("build-dir"), "debug");
 
     let package_artifact_dir = p.root().join("target-dir/package");
-    assert_exists(&package_artifact_dir);
-    assert_exists(&package_artifact_dir.join("foo-0.0.1.crate"));
-    assert!(package_artifact_dir.join("foo-0.0.1.crate").is_file());
+    assert!(!package_artifact_dir.exists());
 
     let package_build_dir = p.root().join("build-dir/package");
     assert_exists(&package_build_dir);