Merge pull request #35 from a-gavin/master

Bump riscv-rt to v0.11.0

Author: almindor

.cargo/config

@@ -7,3 +7,11 @@ rustflags = [
 
 [build]
 target = "riscv32imac-unknown-none-elf"
+
+[profile.release]
+opt-level = "z"  # Optimize for size.
+codegen-units = 1
+lto = true
+
+[profile.dev]
+opt-level = "z"  # Optimize for size.

Cargo.toml

@@ -18,12 +18,12 @@ default-target = "x86_64-unknown-linux-gnu"
 gd32vf103xx-hal = "0.5.0"
 embedded-hal = "0.2.6"
 nb = "1.0.0"
-riscv = "0.6.0"
+riscv = "0.10.1"
 st7735-lcd = { version = "0.8.1", optional = true }
 embedded-sdmmc = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
-riscv-rt = "0.8.0"
+riscv-rt = "0.11.0"
 panic-halt = "0.2.0"
 embedded-graphics = "0.7.1"
 ushell = "0.3.5"

src/stdout.rs

@@ -57,7 +57,7 @@ pub fn configure<X, Y>(
     let serial = Serial::new(uart, (tx, rx), config, afio, rcu);
     let (tx, _) = serial.split();
 
-    interrupt::free(|_| {
+    interrupt::free(|| {
         unsafe {
             STDOUT.replace(SerialWrapper(tx));
         }
@@ -66,7 +66,7 @@ pub fn configure<X, Y>(
 
 /// Writes string to stdout
 pub fn write_str(s: &str) {
-    interrupt::free(|_| unsafe {
+    interrupt::free(|| unsafe {
         if let Some(stdout) = STDOUT.as_mut() {
             let _ = stdout.write_str(s);
         }
@@ -75,7 +75,7 @@ pub fn write_str(s: &str) {
 
 /// Writes formatted string to stdout
 pub fn write_fmt(args: fmt::Arguments) {
-    interrupt::free(|_| unsafe {
+    interrupt::free(|| unsafe {
         if let Some(stdout) = STDOUT.as_mut() {
             let _ = stdout.write_fmt(args);
         }