Factor out a function for building a NewCrate.

Author: jneem

src/cargo/ops/registry/publish.rs

@@ -319,14 +319,12 @@ fn verify_dependencies(
     Ok(())
 }
 
-fn transmit(
+pub(crate) fn prepare_transmit(
     gctx: &GlobalContext,
     pkg: &Package,
-    tarball: &File,
-    registry: &mut Registry,
     registry_id: SourceId,
-    dry_run: bool,
-) -> CargoResult<()> {
+    require_readme_and_license: bool,
+) -> CargoResult<NewCrate> {
     let deps = pkg
         .dependencies()
         .iter()
@@ -401,19 +399,20 @@ fn transmit(
             paths::read(&pkg.root().join(readme))
                 .with_context(|| format!("failed to read `readme` file for package `{}`", pkg))
         })
-        .transpose()?;
+        .transpose()
+        .or_else(|e| {
+            if require_readme_and_license {
+                Err(e)
+            } else {
+                Ok(None)
+            }
+        })?;
     if let Some(ref file) = *license_file {
-        if !pkg.root().join(file).exists() {
+        if require_readme_and_license && !pkg.root().join(file).exists() {
             bail!("the license file `{}` does not exist", file)
         }
     }
 
-    // Do not upload if performing a dry run
-    if dry_run {
-        gctx.shell().warn("aborting upload due to dry run")?;
-        return Ok(());
-    }
-
     let deps_set = deps
         .iter()
         .map(|dep| dep.name.clone())
@@ -445,30 +444,46 @@ fn transmit(
         None => BTreeMap::new(),
     };
 
+    Ok(NewCrate {
+        name: pkg.name().to_string(),
+        vers: pkg.version().to_string(),
+        deps,
+        features: string_features,
+        authors: authors.clone(),
+        description: description.clone(),
+        homepage: homepage.clone(),
+        documentation: documentation.clone(),
+        keywords: keywords.clone(),
+        categories: categories.clone(),
+        readme: readme_content,
+        readme_file: readme.clone(),
+        repository: repository.clone(),
+        license: license.clone(),
+        license_file: license_file.clone(),
+        badges: badges.clone(),
+        links: links.clone(),
+        rust_version,
+    })
+}
+
+fn transmit(
+    gctx: &GlobalContext,
+    pkg: &Package,
+    tarball: &File,
+    registry: &mut Registry,
+    registry_id: SourceId,
+    dry_run: bool,
+) -> CargoResult<()> {
+    let new_crate = prepare_transmit(gctx, pkg, registry_id, true)?;
+
+    // Do not upload if performing a dry run
+    if dry_run {
+        gctx.shell().warn("aborting upload due to dry run")?;
+        return Ok(());
+    }
+
     let warnings = registry
-        .publish(
-            &NewCrate {
-                name: pkg.name().to_string(),
-                vers: pkg.version().to_string(),
-                deps,
-                features: string_features,
-                authors: authors.clone(),
-                description: description.clone(),
-                homepage: homepage.clone(),
-                documentation: documentation.clone(),
-                keywords: keywords.clone(),
-                categories: categories.clone(),
-                readme: readme_content,
-                readme_file: readme.clone(),
-                repository: repository.clone(),
-                license: license.clone(),
-                license_file: license_file.clone(),
-                badges: badges.clone(),
-                links: links.clone(),
-                rust_version,
-            },
-            tarball,
-        )
+        .publish(&new_crate, tarball)
         .with_context(|| format!("failed to publish to registry at {}", registry.host()))?;
 
     if !warnings.invalid_categories.is_empty() {