-Znext-lockfile-bump: Don't suggest using -Z on stable

Author: ehuss

src/cargo/core/resolver/encode.rs

@@ -159,11 +159,11 @@ impl EncodableResolve {
         let mut checksums = HashMap::new();
 
         let mut version = match self.version {
-            Some(4) => {
+            Some(4) if ws.config().nightly_features_allowed => {
                 if unstable_lockfile_version_allowed {
                     ResolveVersion::V4
                 } else {
-                    anyhow::bail!("lock file version 4 requires `-Znext-lockfile-bump`",)
+                    anyhow::bail!("lock file version 4 requires `-Znext-lockfile-bump`");
                 }
             }
             Some(3) => ResolveVersion::V3,

tests/testsuite/lockfile_compat.rs

@@ -912,6 +912,21 @@ fn v4_is_unstable() {
             "\
 error: failed to parse lock file at: [CWD]/Cargo.lock
 
+Caused by:
+  lock file version `4` was found, but this version of Cargo does not \
+  understand this lock file, perhaps Cargo needs to be updated?
+",
+        )
+        .run();
+
+    // On nightly, let the user know about the `-Z` flag.
+    p.cargo("fetch")
+        .masquerade_as_nightly_cargo(&["-Znext-lockfile-bump"])
+        .with_status(101)
+        .with_stderr(
+            "\
+error: failed to parse lock file at: [CWD]/Cargo.lock
+
 Caused by:
   lock file version 4 requires `-Znext-lockfile-bump`
 ",