Upgrade to Rust 2021 edition

andre-richter · andre-richter · commit fb4a30f64cb3 · 2021-10-13T08:19:06.000+02:00
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -1,5 +1,5 @@
 newline_style = "Unix"
-edition = "2018"
+edition = "2021"
 imports_granularity = "Crate"
 format_code_in_doc_comments = true
 normalize_comments = true
diff --git a/01_wait_forever/Cargo.toml b/01_wait_forever/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/02_runtime_init/Cargo.toml b/02_runtime_init/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.2.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/02_runtime_init/README.md b/02_runtime_init/README.md
@@ -38,7 +38,7 @@ diff -uNr 01_wait_forever/Cargo.toml 02_runtime_init/Cargo.toml
 -version = "0.1.0"
 +version = "0.2.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 @@ -21,3 +21,8 @@
  ##--------------------------------------------------------------------------------------------------
diff --git a/03_hacky_hello_world/Cargo.toml b/03_hacky_hello_world/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.3.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/03_hacky_hello_world/README.md b/03_hacky_hello_world/README.md
@@ -41,7 +41,7 @@ diff -uNr 02_runtime_init/Cargo.toml 03_hacky_hello_world/Cargo.toml
 -version = "0.2.0"
 +version = "0.3.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile
diff --git a/04_safe_globals/Cargo.toml b/04_safe_globals/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.4.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/04_safe_globals/README.md b/04_safe_globals/README.md
@@ -64,7 +64,7 @@ diff -uNr 03_hacky_hello_world/Cargo.toml 04_safe_globals/Cargo.toml
 -version = "0.3.0"
 +version = "0.4.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 03_hacky_hello_world/src/bsp/raspberrypi/console.rs 04_safe_globals/src/bsp/raspberrypi/console.rs
diff --git a/05_drivers_gpio_uart/Cargo.toml b/05_drivers_gpio_uart/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.5.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/05_drivers_gpio_uart/README.md b/05_drivers_gpio_uart/README.md
@@ -118,7 +118,7 @@ diff -uNr 04_safe_globals/Cargo.toml 05_drivers_gpio_uart/Cargo.toml
 -version = "0.4.0"
 +version = "0.5.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 @@ -9,8 +9,8 @@
 
diff --git a/06_uart_chainloader/Cargo.toml b/06_uart_chainloader/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.6.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/06_uart_chainloader/README.md b/06_uart_chainloader/README.md
@@ -129,7 +129,7 @@ diff -uNr 05_drivers_gpio_uart/Cargo.toml 06_uart_chainloader/Cargo.toml
 -version = "0.5.0"
 +version = "0.6.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 Binary files 05_drivers_gpio_uart/demo_payload_rpi3.img and 06_uart_chainloader/demo_payload_rpi3.img differ
 Binary files 05_drivers_gpio_uart/demo_payload_rpi4.img and 06_uart_chainloader/demo_payload_rpi4.img differ
diff --git a/07_timestamps/Cargo.toml b/07_timestamps/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.7.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/07_timestamps/README.md b/07_timestamps/README.md
@@ -54,7 +54,7 @@ diff -uNr 06_uart_chainloader/Cargo.toml 07_timestamps/Cargo.toml
 -version = "0.6.0"
 +version = "0.7.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 Binary files 06_uart_chainloader/demo_payload_rpi3.img and 07_timestamps/demo_payload_rpi3.img differ
 Binary files 06_uart_chainloader/demo_payload_rpi4.img and 07_timestamps/demo_payload_rpi4.img differ
diff --git a/08_hw_debug_JTAG/Cargo.toml b/08_hw_debug_JTAG/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.8.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/08_hw_debug_JTAG/README.md b/08_hw_debug_JTAG/README.md
@@ -314,7 +314,7 @@ diff -uNr 07_timestamps/Cargo.toml 08_hw_debug_JTAG/Cargo.toml
 -version = "0.7.0"
 +version = "0.8.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 07_timestamps/Makefile 08_hw_debug_JTAG/Makefile
diff --git a/09_privilege_level/Cargo.toml b/09_privilege_level/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.9.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/09_privilege_level/README.md b/09_privilege_level/README.md
@@ -205,7 +205,7 @@ diff -uNr 08_hw_debug_JTAG/Cargo.toml 09_privilege_level/Cargo.toml
 -version = "0.8.0"
 +version = "0.9.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 08_hw_debug_JTAG/src/_arch/aarch64/cpu/boot.rs 09_privilege_level/src/_arch/aarch64/cpu/boot.rs
diff --git a/10_virtual_mem_part1_identity_mapping/Cargo.toml b/10_virtual_mem_part1_identity_mapping/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.10.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/10_virtual_mem_part1_identity_mapping/README.md b/10_virtual_mem_part1_identity_mapping/README.md
@@ -358,7 +358,7 @@ diff -uNr 09_privilege_level/Cargo.toml 10_virtual_mem_part1_identity_mapping/Ca
 -version = "0.9.0"
 +version = "0.10.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 09_privilege_level/src/_arch/aarch64/memory/mmu/translation_table.rs 10_virtual_mem_part1_identity_mapping/src/_arch/aarch64/memory/mmu/translation_table.rs
diff --git a/11_exceptions_part1_groundwork/Cargo.toml b/11_exceptions_part1_groundwork/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.11.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/11_exceptions_part1_groundwork/README.md b/11_exceptions_part1_groundwork/README.md
@@ -486,7 +486,7 @@ diff -uNr 10_virtual_mem_part1_identity_mapping/Cargo.toml 11_exceptions_part1_g
 -version = "0.10.0"
 +version = "0.11.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 10_virtual_mem_part1_identity_mapping/src/_arch/aarch64/exception.rs 11_exceptions_part1_groundwork/src/_arch/aarch64/exception.rs
diff --git a/12_integrated_testing/Cargo.toml b/12_integrated_testing/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.12.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/12_integrated_testing/README.md b/12_integrated_testing/README.md
@@ -881,7 +881,7 @@ diff -uNr 11_exceptions_part1_groundwork/Cargo.toml 12_integrated_testing/Cargo.
 -version = "0.11.0"
 +version = "0.12.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 @@ -11,21 +11,46 @@
  default = []
@@ -1722,7 +1722,7 @@ diff -uNr 11_exceptions_part1_groundwork/test-macros/Cargo.toml 12_integrated_te
 +name = "test-macros"
 +version = "0.1.0"
 +authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-+edition = "2018"
++edition = "2021"
 +
 +[lib]
 +proc-macro = true
@@ -2002,7 +2002,7 @@ diff -uNr 11_exceptions_part1_groundwork/test-types/Cargo.toml 12_integrated_tes
 +name = "test-types"
 +version = "0.1.0"
 +authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-+edition = "2018"
++edition = "2021"
 
 diff -uNr 11_exceptions_part1_groundwork/test-types/src/lib.rs 12_integrated_testing/test-types/src/lib.rs
 --- 11_exceptions_part1_groundwork/test-types/src/lib.rs
diff --git a/12_integrated_testing/test-macros/Cargo.toml b/12_integrated_testing/test-macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test-macros"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/12_integrated_testing/test-types/Cargo.toml b/12_integrated_testing/test-types/Cargo.toml
@@ -2,4 +2,4 @@
 name = "test-types"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
diff --git a/13_exceptions_part2_peripheral_IRQs/Cargo.toml b/13_exceptions_part2_peripheral_IRQs/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.13.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/13_exceptions_part2_peripheral_IRQs/README.md b/13_exceptions_part2_peripheral_IRQs/README.md
@@ -755,7 +755,7 @@ diff -uNr 12_integrated_testing/Cargo.toml 13_exceptions_part2_peripheral_IRQs/C
 -version = "0.12.0"
 +version = "0.13.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 12_integrated_testing/Makefile 13_exceptions_part2_peripheral_IRQs/Makefile
diff --git a/13_exceptions_part2_peripheral_IRQs/test-macros/Cargo.toml b/13_exceptions_part2_peripheral_IRQs/test-macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test-macros"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/13_exceptions_part2_peripheral_IRQs/test-types/Cargo.toml b/13_exceptions_part2_peripheral_IRQs/test-types/Cargo.toml
@@ -2,4 +2,4 @@
 name = "test-types"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
diff --git a/14_virtual_mem_part2_mmio_remap/Cargo.toml b/14_virtual_mem_part2_mmio_remap/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.14.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/14_virtual_mem_part2_mmio_remap/README.md b/14_virtual_mem_part2_mmio_remap/README.md
@@ -380,7 +380,7 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/Cargo.toml 14_virtual_mem_part2_mm
 -version = "0.13.0"
 +version = "0.14.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 13_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/exception.rs 14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs
diff --git a/14_virtual_mem_part2_mmio_remap/test-macros/Cargo.toml b/14_virtual_mem_part2_mmio_remap/test-macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test-macros"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/14_virtual_mem_part2_mmio_remap/test-types/Cargo.toml b/14_virtual_mem_part2_mmio_remap/test-types/Cargo.toml
@@ -2,4 +2,4 @@
 name = "test-types"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
diff --git a/15_virtual_mem_part3_precomputed_tables/Cargo.toml b/15_virtual_mem_part3_precomputed_tables/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.15.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/15_virtual_mem_part3_precomputed_tables/README.md b/15_virtual_mem_part3_precomputed_tables/README.md
@@ -770,7 +770,7 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/Cargo.toml 15_virtual_mem_part3_precom
 -version = "0.14.0"
 +version = "0.15.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 14_virtual_mem_part2_mmio_remap/Makefile 15_virtual_mem_part3_precomputed_tables/Makefile
diff --git a/15_virtual_mem_part3_precomputed_tables/test-macros/Cargo.toml b/15_virtual_mem_part3_precomputed_tables/test-macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test-macros"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/15_virtual_mem_part3_precomputed_tables/test-types/Cargo.toml b/15_virtual_mem_part3_precomputed_tables/test-types/Cargo.toml
@@ -2,4 +2,4 @@
 name = "test-types"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
diff --git a/16_virtual_mem_part4_higher_half_kernel/Cargo.toml b/16_virtual_mem_part4_higher_half_kernel/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.16.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
diff --git a/16_virtual_mem_part4_higher_half_kernel/README.md b/16_virtual_mem_part4_higher_half_kernel/README.md
@@ -240,7 +240,7 @@ diff -uNr 15_virtual_mem_part3_precomputed_tables/Cargo.toml 16_virtual_mem_part
 -version = "0.15.0"
 +version = "0.16.0"
  authors = ["Andre Richter <andre.o.richter@gmail.com>"]
- edition = "2018"
+ edition = "2021"
 
 
 diff -uNr 15_virtual_mem_part3_precomputed_tables/src/_arch/aarch64/cpu/boot.rs 16_virtual_mem_part4_higher_half_kernel/src/_arch/aarch64/cpu/boot.rs
diff --git a/16_virtual_mem_part4_higher_half_kernel/test-macros/Cargo.toml b/16_virtual_mem_part4_higher_half_kernel/test-macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test-macros"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/16_virtual_mem_part4_higher_half_kernel/test-types/Cargo.toml b/16_virtual_mem_part4_higher_half_kernel/test-types/Cargo.toml
@@ -2,4 +2,4 @@
 name = "test-types"
 version = "0.1.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
diff --git a/X1_JTAG_boot/Cargo.toml b/X1_JTAG_boot/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mingo"
 version = "0.8.0"
 authors = ["Andre Richter <andre.o.richter@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 lto = true
