refactor(toml): Remove unused Rc

Author: epage

src/cargo/ops/cargo_package.rs

@@ -3,7 +3,6 @@ use std::fs::{self, File};
 use std::io::prelude::*;
 use std::io::SeekFrom;
 use std::path::{Path, PathBuf};
-use std::rc::Rc;
 use std::sync::Arc;
 use std::task::Poll;
 
@@ -412,16 +411,14 @@ 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 = Rc::new(
-        orig_pkg
-            .manifest()
-            .original()
-            .prepare_for_publish(ws, orig_pkg.root())?,
-    );
+    let toml_manifest = orig_pkg
+        .manifest()
+        .original()
+        .prepare_for_publish(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)?;
+        TomlManifest::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();

src/cargo/util/toml/mod.rs

@@ -111,7 +111,6 @@ fn read_manifest_from_str(
         }
     };
 
-    let manifest = Rc::new(manifest);
     if let Some(deps) = manifest
         .workspace
         .as_ref()
@@ -128,7 +127,7 @@ fn read_manifest_from_str(
     }
     return if manifest.project.is_some() || manifest.package.is_some() {
         let (mut manifest, paths) = schema::TomlManifest::to_real_manifest(
-            &manifest,
+            manifest,
             embedded,
             source_id,
             package_root,
@@ -145,7 +144,7 @@ fn read_manifest_from_str(
         Ok((EitherManifest::Real(manifest), paths))
     } else {
         let (mut m, paths) =
-            schema::TomlManifest::to_virtual_manifest(&manifest, source_id, package_root, config)?;
+            schema::TomlManifest::to_virtual_manifest(manifest, source_id, package_root, config)?;
         add_unused(m.warnings_mut());
         Ok((EitherManifest::Virtual(m), paths))
     };
@@ -391,7 +390,7 @@ impl schema::TomlManifest {
     }
 
     pub fn to_real_manifest(
-        me: &Rc<schema::TomlManifest>,
+        me: schema::TomlManifest,
         embedded: bool,
         source_id: SourceId,
         package_root: &Path,
@@ -603,7 +602,7 @@ impl schema::TomlManifest {
         // If we have a lib with no path, use the inferred lib or else the package name.
         let targets = targets(
             &features,
-            me,
+            &me,
             package_name,
             package_root,
             edition,
@@ -1119,7 +1118,7 @@ impl schema::TomlManifest {
     }
 
     fn to_virtual_manifest(
-        me: &Rc<schema::TomlManifest>,
+        me: schema::TomlManifest,
         source_id: SourceId,
         root: &Path,
         config: &Config,