Skip to content

Commit 0f57cb8

Browse files
committed
Use version = 3, not version = 1
1 parent 07162db commit 0f57cb8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/cargo/core/resolver/encode.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl EncodableResolve {
143143
let mut checksums = HashMap::new();
144144

145145
let mut version = match self.version {
146-
Some(1) => ResolveVersion::V3,
146+
Some(3) => ResolveVersion::V3,
147147
Some(n) => bail!(
148148
"lock file version `{}` was found, but this version of Cargo \
149149
does not understand this lock file, perhaps Cargo needs \
@@ -597,7 +597,7 @@ impl<'a> ser::Serialize for Resolve {
597597
metadata,
598598
patch,
599599
version: match self.version() {
600-
ResolveVersion::V3 => Some(1),
600+
ResolveVersion::V3 => Some(3),
601601
ResolveVersion::V2 | ResolveVersion::V1 => None,
602602
},
603603
}

tests/testsuite/lockfile_compat.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ fn v3_and_git() {
649649
let lockfile = format!(
650650
r#"# This file is automatically @generated by Cargo.
651651
# It is not intended for manual editing.
652-
version = 1
652+
version = 3
653653
654654
[[package]]
655655
name = "dep1"
@@ -684,7 +684,7 @@ dependencies = [
684684
),
685685
)
686686
.file("src/lib.rs", "")
687-
.file("Cargo.lock", "version = 1")
687+
.file("Cargo.lock", "version = 3")
688688
.build();
689689

690690
p.cargo("fetch").run();

0 commit comments

Comments
 (0)