refactor(toml): Make rest of TomlManifest logic free functions

epage · Nov 30, 2023 · ac5b461 · ac5b461
1 parent 3d034aa
commit ac5b461
Show file tree

Hide file tree

Showing 3 changed files with 977 additions and 987 deletions.
diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs
@@ -31,6 +31,7 @@ use crate::util::network::http::http_handle_and_timeout;
 use crate::util::network::http::HttpTimeout;
 use crate::util::network::retry::{Retry, RetryResult};
 use crate::util::network::sleep::SleepTracker;
+use crate::util::toml::prepare_for_publish;
 use crate::util::RustVersion;
 use crate::util::{self, internal, Config, Progress, ProgressStyle};
 
@@ -197,10 +198,7 @@ impl Package {
     }
 
     pub fn to_registry_toml(&self, ws: &Workspace<'_>) -> CargoResult<String> {
-        let manifest = self
-            .manifest()
-            .original()
-            .prepare_for_publish(ws, self.root())?;
+        let manifest = prepare_for_publish(self.manifest().original(), ws, self.root())?;
         let toml = toml::to_string_pretty(&manifest)?;
         Ok(format!("{}\n{}", MANIFEST_PREAMBLE, toml))
     }

diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs
@@ -16,7 +16,7 @@ use crate::sources::PathSource;
 use crate::util::cache_lock::CacheLockMode;
 use crate::util::config::JobsConfig;
 use crate::util::errors::CargoResult;
-use crate::util::toml::schema::TomlManifest;
+use crate::util::toml::{prepare_for_publish, to_real_manifest};
 use crate::util::{self, human_readable_bytes, restricted_names, Config, FileLock};
 use crate::{drop_println, ops};
 use anyhow::Context as _;
@@ -454,14 +454,11 @@ fn build_lock(ws: &Workspace<'_>, orig_pkg: &Package) -> CargoResult<String> {
     let orig_resolve = ops::load_pkg_lockfile(ws)?;
 
     // Convert Package -> TomlManifest -> Manifest -> Package
-    let toml_manifest = orig_pkg
-        .manifest()
-        .original()
-        .prepare_for_publish(ws, orig_pkg.root())?;
+    let toml_manifest = prepare_for_publish(orig_pkg.manifest().original(), ws, orig_pkg.root())?;
     let package_root = orig_pkg.root();
     let source_id = orig_pkg.package_id().source_id();
     let (manifest, _nested_paths) =
-        TomlManifest::to_real_manifest(toml_manifest, false, source_id, package_root, config)?;
+        to_real_manifest(toml_manifest, false, source_id, package_root, config)?;
     let new_pkg = Package::new(manifest, orig_pkg.manifest_path());
 
     let max_rust_version = new_pkg.rust_version().cloned();