From 3387d53b963dca802504f88e70f195cd4c3fb0bc Mon Sep 17 00:00:00 2001
From: Benedikt Reinartz <filmor@gmail.com>
Date: Mon, 28 Aug 2023 17:51:07 +0200
Subject: [PATCH] Bump edition to 2021 and use v2 resolver for workspace

---
 Cargo.toml                                            | 1 +
 rustler/Cargo.toml                                    | 2 +-
 rustler_benchmarks/native/benchmark/Cargo.toml        | 2 +-
 rustler_sys/Cargo.toml                                | 2 +-
 rustler_tests/native/binary_example/Cargo.toml        | 2 +-
 rustler_tests/native/rustler_compile_tests/Cargo.toml | 2 +-
 rustler_tests/native/rustler_test/Cargo.toml          | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4bfa21ad..33211ea7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "rustler",
   "rustler_bigint",
diff --git a/rustler/Cargo.toml b/rustler/Cargo.toml
index b4810595..7f3c76ab 100644
--- a/rustler/Cargo.toml
+++ b/rustler/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.29.1" # rustler version
 authors = ["Hansihe <me@hansihe.com>"]
 license = "MIT/Apache-2.0"
 readme = "../README.md"
-edition = "2018"
+edition = "2021"
 
 [features]
 default = ["derive", "nif_version_2_15"]
diff --git a/rustler_benchmarks/native/benchmark/Cargo.toml b/rustler_benchmarks/native/benchmark/Cargo.toml
index 0adcb365..3f7d67dd 100644
--- a/rustler_benchmarks/native/benchmark/Cargo.toml
+++ b/rustler_benchmarks/native/benchmark/Cargo.toml
@@ -2,7 +2,7 @@
 name = "benchmark"
 version = "0.1.0"
 authors = []
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "benchmark"
diff --git a/rustler_sys/Cargo.toml b/rustler_sys/Cargo.toml
index fd49a29a..85cc6f65 100644
--- a/rustler_sys/Cargo.toml
+++ b/rustler_sys/Cargo.toml
@@ -28,7 +28,7 @@ documentation = "https://docs.rs/rustler_sys"
 repository = "https://github.com/rusterlium/rustler"
 license = "MIT/Apache-2.0"
 keywords = ["FFI", "Erlang", "NIF"]
-edition = "2018"
+edition = "2021"
 
 build = "build.rs"
 
diff --git a/rustler_tests/native/binary_example/Cargo.toml b/rustler_tests/native/binary_example/Cargo.toml
index d571682a..bca72e47 100644
--- a/rustler_tests/native/binary_example/Cargo.toml
+++ b/rustler_tests/native/binary_example/Cargo.toml
@@ -2,7 +2,7 @@
 name = "binary_example"
 version = "0.1.0"
 authors = []
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "binary_example"
diff --git a/rustler_tests/native/rustler_compile_tests/Cargo.toml b/rustler_tests/native/rustler_compile_tests/Cargo.toml
index 7dda8044..7db15519 100644
--- a/rustler_tests/native/rustler_compile_tests/Cargo.toml
+++ b/rustler_tests/native/rustler_compile_tests/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rustler_compile_tests"
 version = "0.1.0"
 authors = []
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "rustler_compile_test"
diff --git a/rustler_tests/native/rustler_test/Cargo.toml b/rustler_tests/native/rustler_test/Cargo.toml
index fd790466..dc341923 100644
--- a/rustler_tests/native/rustler_test/Cargo.toml
+++ b/rustler_tests/native/rustler_test/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rustler_test"
 version = "0.1.0"
 authors = []
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "rustler_test"