From 12031c0be5a602963ca1baed28369d99fbaf8e69 Mon Sep 17 00:00:00 2001
From: Simon Renblad <srenblad@m-labs.hk>
Date: Tue, 28 Jan 2025 16:04:01 +0800
Subject: [PATCH] bump edition to 2021

---
 src/libboard_artiq/Cargo.toml.tpl | 2 +-
 src/libbuild_zynq/Cargo.toml      | 1 +
 src/libc/Cargo.toml.tpl           | 2 +-
 src/libdwarf/Cargo.toml           | 2 +-
 src/libdyld/Cargo.toml.tpl        | 1 +
 src/libio/Cargo.toml.tpl          | 1 +
 src/libksupport/Cargo.toml.tpl    | 2 +-
 src/libunwind/Cargo.toml          | 2 +-
 src/runtime/Cargo.toml.tpl        | 4 ++--
 src/satman/Cargo.toml.tpl         | 1 +
 10 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/libboard_artiq/Cargo.toml.tpl b/src/libboard_artiq/Cargo.toml.tpl
index c919bea..a8ddeb8 100644
--- a/src/libboard_artiq/Cargo.toml.tpl
+++ b/src/libboard_artiq/Cargo.toml.tpl
@@ -2,7 +2,7 @@
 name = "libboard_artiq"
 version = "0.0.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "libboard_artiq"
diff --git a/src/libbuild_zynq/Cargo.toml b/src/libbuild_zynq/Cargo.toml
index b5cc9e6..66f6cbf 100644
--- a/src/libbuild_zynq/Cargo.toml
+++ b/src/libbuild_zynq/Cargo.toml
@@ -2,6 +2,7 @@
 authors = ["M-Labs"]
 name = "build_zynq"
 version = "0.0.0"
+edition = "2021"
 
 [lib]
 name = "build_zynq"
diff --git a/src/libc/Cargo.toml.tpl b/src/libc/Cargo.toml.tpl
index 89c75c4..49e912f 100644
--- a/src/libc/Cargo.toml.tpl
+++ b/src/libc/Cargo.toml.tpl
@@ -2,7 +2,7 @@
 name = "libc"
 version = "0.1.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 
 [dependencies]
diff --git a/src/libdwarf/Cargo.toml b/src/libdwarf/Cargo.toml
index 4a8ae9e..ffde6c6 100644
--- a/src/libdwarf/Cargo.toml
+++ b/src/libdwarf/Cargo.toml
@@ -3,7 +3,7 @@
 authors = ["The Rust Project Developers"]
 name = "dwarf"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 test = false
diff --git a/src/libdyld/Cargo.toml.tpl b/src/libdyld/Cargo.toml.tpl
index 481c14f..80a815d 100644
--- a/src/libdyld/Cargo.toml.tpl
+++ b/src/libdyld/Cargo.toml.tpl
@@ -2,6 +2,7 @@
 authors = ["M-Labs"]
 name = "dyld"
 version = "0.1.0"
+edition = "2021"
 
 [lib]
 name = "dyld"
diff --git a/src/libio/Cargo.toml.tpl b/src/libio/Cargo.toml.tpl
index 9c9baf8..aa29134 100644
--- a/src/libio/Cargo.toml.tpl
+++ b/src/libio/Cargo.toml.tpl
@@ -2,6 +2,7 @@
 authors = ["M-Labs"]
 name = "io"
 version = "0.0.0"
+edition = "2021"
 
 [lib]
 name = "io"
diff --git a/src/libksupport/Cargo.toml.tpl b/src/libksupport/Cargo.toml.tpl
index 4cf01e6..2493527 100644
--- a/src/libksupport/Cargo.toml.tpl
+++ b/src/libksupport/Cargo.toml.tpl
@@ -3,7 +3,7 @@ name = "ksupport"
 description = "Kernel support for Zynq-based platforms"
 version = "0.1.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [build-dependencies]
 build_zynq = { path = "../libbuild_zynq" }
diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml
index 346268a..bbf7242 100644
--- a/src/libunwind/Cargo.toml
+++ b/src/libunwind/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["The Rust Project Developers"]
 name = "unwind"
 version = "0.0.0"
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 include = [
   '/libunwind/*',
 ]
diff --git a/src/runtime/Cargo.toml.tpl b/src/runtime/Cargo.toml.tpl
index 2630c6e..fde9473 100644
--- a/src/runtime/Cargo.toml.tpl
+++ b/src/runtime/Cargo.toml.tpl
@@ -3,7 +3,7 @@ name = "runtime"
 description = "ARTIQ runtime on Zynq"
 version = "0.1.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [features]
 target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706", "libconfig/target_zc706", "libboard_artiq/target_zc706"]
@@ -16,7 +16,7 @@ build_zynq = { path = "../libbuild_zynq" }
 
 [dependencies]
 num-traits = { version = "0.2", default-features = false }
-num-derive = "0.3"
+num-derive = "0.4"
 cslice = "0.3"
 log = "0.4"
 embedded-hal = "0.2"
diff --git a/src/satman/Cargo.toml.tpl b/src/satman/Cargo.toml.tpl
index f2be876..efef2b6 100644
--- a/src/satman/Cargo.toml.tpl
+++ b/src/satman/Cargo.toml.tpl
@@ -3,6 +3,7 @@ authors = ["M-Labs"]
 name = "satman"
 version = "0.0.0"
 build = "build.rs"
+edition = "2021"
 
 [features]
 target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706", "libconfig/target_zc706", "libboard_artiq/target_zc706"]