feat: lockfile path refactoring

Author: ifropc

src/bin/cargo/commands/fix.rs

@@ -1,4 +1,6 @@
 use crate::command_prelude::*;
+use cargo::core::Workspace;
+use std::path::Path;
 
 use cargo::ops;
 
@@ -71,7 +73,14 @@ pub fn exec(gctx: &mut GlobalContext, args: &ArgMatches) -> CliResult {
     // Unlike other commands default `cargo fix` to all targets to fix as much
     // code as we can.
     let root_manifest = args.root_manifest(gctx)?;
-    let ws = args.workspace(gctx)?;
+
+    // Can't use workspace() to avoid using -Zavoid-dev-deps (if passed)
+    let mut ws = Workspace::new(&root_manifest, gctx)?;
+    ws.set_resolve_honors_rust_version(args.honor_rust_version());
+    let lockfile_path =
+        lockfile_path(args.get_one::<String>("lockfile-path").map(Path::new), gctx)?;
+    ws.set_requested_lockfile_path(lockfile_path);
+
     let mut opts = args.compile_options(gctx, mode, Some(&ws), ProfileChecking::LegacyTestOnly)?;
 
     if !opts.filter.is_specific() {

src/cargo/core/workspace.rs

@@ -103,7 +103,7 @@ pub struct Workspace<'gctx> {
     // file. This is set for `cargo install` without `--locked`.
     ignore_lock: bool,
 
-    // Requested path of the lockfile (i.e. passed as the cli flag)
+    /// Requested path of the lockfile (i.e. passed as the cli flag)
     requested_lockfile_path: Option<PathBuf>,
 
     /// The resolver behavior specified with the `resolver` field.

src/cargo/ops/lockfile.rs

@@ -1,7 +1,8 @@
+use std::io::prelude::*;
+
 use crate::core::{resolver, Resolve, ResolveVersion, Workspace};
 use crate::util::errors::CargoResult;
 use crate::util::Filesystem;
-use std::io::prelude::*;
 
 use anyhow::Context as _;
 

src/cargo/util/command_prelude.rs

@@ -299,7 +299,7 @@ pub trait CommandExt: Sized {
     fn arg_lockfile_path(self) -> Self {
         self._arg(
             opt("lockfile-path", "Path to Cargo.lock (unstable)")
-                .value_name("FILE")
+                .value_name("PATH")
                 .help_heading(heading::MANIFEST_OPTIONS),
         )
     }
@@ -1015,10 +1015,7 @@ pub fn lockfile_path(
     let path = gctx.cwd().join(lockfile_path);
 
     if !path.ends_with(LOCKFILE_NAME) && !crate::util::toml::is_embedded(&path) {
-        bail!(
-            "the lockfile-path must be a path to a {} file",
-            LOCKFILE_NAME
-        )
+        bail!("the lockfile-path must be a path to a {LOCKFILE_NAME} file")
     }
     if path.is_dir() {
         bail!(

src/doc/man/generated_txt/cargo-add.txt

@@ -201,11 +201,11 @@ OPTIONS
            Changes the path of the lockfile from the default
            (<workspace_root>/Cargo.lock) to PATH. PATH must end with Cargo.lock
            (e.g. --lockfile-path /tmp/temporary-lockfile/Cargo.lock). Note that
-           providing --lockfile-path will ignore existing default lockfile
-           (<workspace_root>/Cargo.lock), if exists, and instead will either
-           use PATH lockfile (or write a new lockfile into the provided path if
-           it doesn’t exist). This flag can be used to run most commands in
-           read-only directories, writing lockfile into the provided PATH.
+           providing --lockfile-path will ignore existing lockfile at the
+           default path, and instead will either use the lockfile from PATH, or
+           write a new lockfile into the provided PATH if it doesn’t exist.
+           This flag can be used to run most commands in read-only directories,
+           writing lockfile into the provided PATH.
 
            This option is only available on the nightly channel
            <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and

src/doc/man/generated_txt/cargo-bench.txt

@@ -372,11 +372,11 @@ OPTIONS
            Changes the path of the lockfile from the default
            (<workspace_root>/Cargo.lock) to PATH. PATH must end with Cargo.lock
            (e.g. --lockfile-path /tmp/temporary-lockfile/Cargo.lock). Note that
-           providing --lockfile-path will ignore existing default lockfile
-           (<workspace_root>/Cargo.lock), if exists, and instead will either
-           use PATH lockfile (or write a new lockfile into the provided path if
-           it doesn’t exist). This flag can be used to run most commands in
-           read-only directories, writing lockfile into the provided PATH.
+           providing --lockfile-path will ignore existing lockfile at the
+           default path, and instead will either use the lockfile from PATH, or
+           write a new lockfile into the provided PATH if it doesn’t exist.
+           This flag can be used to run most commands in read-only directories,
+           writing lockfile into the provided PATH.
 
            This option is only available on the nightly channel
            <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and

src/doc/man/generated_txt/cargo-build.txt

@@ -306,11 +306,11 @@ OPTIONS
            Changes the path of the lockfile from the default
            (<workspace_root>/Cargo.lock) to PATH. PATH must end with Cargo.lock
            (e.g. --lockfile-path /tmp/temporary-lockfile/Cargo.lock). Note that
-           providing --lockfile-path will ignore existing default lockfile
-           (<workspace_root>/Cargo.lock), if exists, and instead will either
-           use PATH lockfile (or write a new lockfile into the provided path if
-           it doesn’t exist). This flag can be used to run most commands in
-           read-only directories, writing lockfile into the provided PATH.
+           providing --lockfile-path will ignore existing lockfile at the
+           default path, and instead will either use the lockfile from PATH, or
+           write a new lockfile into the provided PATH if it doesn’t exist.
+           This flag can be used to run most commands in read-only directories,
+           writing lockfile into the provided PATH.
 
            This option is only available on the nightly channel
            <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and

src/doc/man/generated_txt/cargo-check.txt

@@ -291,11 +291,11 @@ OPTIONS
            Changes the path of the lockfile from the default
            (<workspace_root>/Cargo.lock) to PATH. PATH must end with Cargo.lock
            (e.g. --lockfile-path /tmp/temporary-lockfile/Cargo.lock). Note that
-           providing --lockfile-path will ignore existing default lockfile
-           (<workspace_root>/Cargo.lock), if exists, and instead will either
-           use PATH lockfile (or write a new lockfile into the provided path if
-           it doesn’t exist). This flag can be used to run most commands in
-           read-only directories, writing lockfile into the provided PATH.
+           providing --lockfile-path will ignore existing lockfile at the
+           default path, and instead will either use the lockfile from PATH, or
+           write a new lockfile into the provided PATH if it doesn’t exist.
+           This flag can be used to run most commands in read-only directories,
+           writing lockfile into the provided PATH.
 
            This option is only available on the nightly channel
            <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and

src/doc/man/generated_txt/cargo-clean.txt

@@ -127,11 +127,11 @@ OPTIONS
            Changes the path of the lockfile from the default
            (<workspace_root>/Cargo.lock) to PATH. PATH must end with Cargo.lock
            (e.g. --lockfile-path /tmp/temporary-lockfile/Cargo.lock). Note that
-           providing --lockfile-path will ignore existing default lockfile
-           (<workspace_root>/Cargo.lock), if exists, and instead will either
-           use PATH lockfile (or write a new lockfile into the provided path if
-           it doesn’t exist). This flag can be used to run most commands in
-           read-only directories, writing lockfile into the provided PATH.
+           providing --lockfile-path will ignore existing lockfile at the
+           default path, and instead will either use the lockfile from PATH, or
+           write a new lockfile into the provided PATH if it doesn’t exist.
+           This flag can be used to run most commands in read-only directories,
+           writing lockfile into the provided PATH.
 
            This option is only available on the nightly channel
            <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and

src/doc/man/generated_txt/cargo-doc.txt

@@ -262,11 +262,11 @@ OPTIONS
            Changes the path of the lockfile from the default
            (<workspace_root>/Cargo.lock) to PATH. PATH must end with Cargo.lock
            (e.g. --lockfile-path /tmp/temporary-lockfile/Cargo.lock). Note that
-           providing --lockfile-path will ignore existing default lockfile
-           (<workspace_root>/Cargo.lock), if exists, and instead will either
-           use PATH lockfile (or write a new lockfile into the provided path if
-           it doesn’t exist). This flag can be used to run most commands in
-           read-only directories, writing lockfile into the provided PATH.
+           providing --lockfile-path will ignore existing lockfile at the
+           default path, and instead will either use the lockfile from PATH, or
+           write a new lockfile into the provided PATH if it doesn’t exist.
+           This flag can be used to run most commands in read-only directories,
+           writing lockfile into the provided PATH.
 
            This option is only available on the nightly channel
            <https://doc.rust-lang.org/book/appendix-07-nightly-rust.html> and