itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(fix): Centralize share manifest load/save across Editions

Browse Source
This commit is contained in:
Ed Page 2024-12-03 15:01:42 -06:00
parent d4b3b9d35a
commit ccd193a1b0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cargo/ops/fix.rs
View File

@ -268,15 +268,15 @@ fn migrate_manifests(ws: &Workspace<'_>, pkgs: &[&Package]) -> CargoResult<()> {
format!("{file} from {existing_edition} edition to {prepare_for_edition}"), format!("{file} from {existing_edition} edition to {prepare_for_edition}"),
)?; )?;
let mut manifest_mut = LocalManifest::try_new(pkg.manifest_path())?;
let document = &mut manifest_mut.data;
let mut fixes = 0;
let ws_original_toml = match ws.root_maybe() { let ws_original_toml = match ws.root_maybe() {
MaybePackage::Package(package) => package.manifest().original_toml(), MaybePackage::Package(package) => package.manifest().original_toml(),
MaybePackage::Virtual(manifest) => manifest.original_toml(), MaybePackage::Virtual(manifest) => manifest.original_toml(),
}; };
if Edition::Edition2024 <= prepare_for_edition { if Edition::Edition2024 <= prepare_for_edition {
let mut manifest_mut = LocalManifest::try_new(pkg.manifest_path())?;
let document = &mut manifest_mut.data;
let mut fixes = 0;
let root = document.as_table_mut(); let root = document.as_table_mut();
if let Some(workspace) = root if let Some(workspace) = root
@ -331,14 +331,14 @@ fn migrate_manifests(ws: &Workspace<'_>, pkgs: &[&Package]) -> CargoResult<()> {
ws_original_toml, ws_original_toml,
); );
} }
}
if 0 < fixes { if 0 < fixes {
let verb = if fixes == 1 { "fix" } else { "fixes" }; let verb = if fixes == 1 { "fix" } else { "fixes" };
let msg = format!("{file} ({fixes} {verb})"); let msg = format!("{file} ({fixes} {verb})");
ws.gctx().shell().status("Fixed", msg)?; ws.gctx().shell().status("Fixed", msg)?;
manifest_mut.write()?; manifest_mut.write()?;
}
} }
} }