From ab18f038c041d09e31a01f64409835f02a6b9ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1?= <47506558+MegaRedHand@users.noreply.github.com>
Date: Mon, 3 Jul 2023 15:54:09 -0300
Subject: [PATCH 1/2] Explicitly set resolver version in virtual manifest

The default for crates with edition >= 2021 is the version 2 of the resolver.
Virtual manifests, however, default to version 1.
Seems that when we moved the VM to its own directory, we also changed the resolver we used.
---
 Cargo.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index b3ae6ea61b..ea0a2a03b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,10 @@
 members = ["cairo-vm-cli", "felt", "vm", "hint_accountant"]
 exclude = ["ensure-no_std"]
 
+# Explicitly set the resolver to the default for edition >= 2021
+# https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
+resolver = "2"
+
 [workspace.package]
 version = "0.8.1"
 edition = "2021"

From fa0e1c4678374b7c07fe8d10c5a9d244741cf768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1?= <47506558+MegaRedHand@users.noreply.github.com>
Date: Mon, 3 Jul 2023 15:58:58 -0300
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f11bf3f42..87c4eb4c1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 #### Upcoming Changes
 
+* fix: specify resolver version 2 in the virtual workspace's manifest [#1311](https://github.com/lambdaclass/cairo-vm/pull/1311)
+
 * chore: remove unused dependencies [#1307](https://github.com/lambdaclass/cairo-vm/pull/1307)
   * rand_core
   * serde_bytes