diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml index aa06754..7a19266 100644 --- a/experiments/Cargo.toml +++ b/experiments/Cargo.toml @@ -3,7 +3,7 @@ name = "experiments" description = "Developing bare-metal Rust on Zynq" version = "0.0.0" authors = ["M-Labs"] -edition = "2018" +edition = "2021" [features] target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706"] diff --git a/flake.nix b/flake.nix index 9b70e5f..cf12d77 100644 --- a/flake.nix +++ b/flake.nix @@ -104,9 +104,7 @@ dontFixup = true; }; - cargo-xbuild = pkgs.cargo-xbuild.overrideAttrs(oa: { - postPatch = "substituteInPlace src/sysroot.rs --replace 2021 2018"; - }); + cargo-xbuild = pkgs.cargo-xbuild; build-crate = name: crate: features: rustPlatform.buildRustPackage rec { name = "${crate}"; diff --git a/libasync/Cargo.toml b/libasync/Cargo.toml index 9693d02..630b73f 100644 --- a/libasync/Cargo.toml +++ b/libasync/Cargo.toml @@ -3,7 +3,7 @@ name = "libasync" description = "low-level async support" version = "0.0.0" authors = ["M-Labs"] -edition = "2018" +edition = "2021" [dependencies] #futures = { version = "0.3", default-features = false } diff --git a/libboard_zynq/Cargo.toml b/libboard_zynq/Cargo.toml index bae2d5d..49f3d52 100644 --- a/libboard_zynq/Cargo.toml +++ b/libboard_zynq/Cargo.toml @@ -3,7 +3,7 @@ name = "libboard_zynq" description = "Drivers for peripherals in the Zynq PS" version = "0.0.0" authors = ["M-Labs"] -edition = "2018" +edition = "2021" [features] target_zc706 = [] diff --git a/libconfig/Cargo.toml b/libconfig/Cargo.toml index 35265c5..69e8472 100644 --- a/libconfig/Cargo.toml +++ b/libconfig/Cargo.toml @@ -2,7 +2,7 @@ name = "libconfig" version = "0.1.0" authors = ["M-Labs"] -edition = "2018" +edition = "2021" [dependencies] libboard_zynq = { path = "../libboard_zynq" } diff --git a/libcortex_a9/Cargo.toml b/libcortex_a9/Cargo.toml index 1553eb9..f5c1ade 100644 --- a/libcortex_a9/Cargo.toml +++ b/libcortex_a9/Cargo.toml @@ -2,7 +2,7 @@ name = "libcortex_a9" version = "0.0.0" authors = ["M-Labs"] -edition = "2018" +edition = "2021" [features] power_saving = [] diff --git a/libregister/Cargo.toml b/libregister/Cargo.toml index 227e658..4fcda83 100644 --- a/libregister/Cargo.toml +++ b/libregister/Cargo.toml @@ -2,7 +2,7 @@ name = "libregister" version = "0.0.0" authors = ["M-Labs"] -edition = "2018" +edition = "2021" [dependencies] vcell = "0.1" diff --git a/libsupport_zynq/Cargo.toml b/libsupport_zynq/Cargo.toml index 18265ea..dc863f6 100644 --- a/libsupport_zynq/Cargo.toml +++ b/libsupport_zynq/Cargo.toml @@ -3,7 +3,7 @@ name = "libsupport_zynq" description = "Software support for running in the Zynq PS" version = "0.0.0" authors = ["M-Labs"] -edition = "2018" +edition = "2021" [features] target_zc706 = ["libboard_zynq/target_zc706"] diff --git a/szl/Cargo.toml b/szl/Cargo.toml index ac16fb0..5dfcd90 100644 --- a/szl/Cargo.toml +++ b/szl/Cargo.toml @@ -3,7 +3,7 @@ name = "szl" description = "Simple Zynq Loader" 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"]