update for cortex-m sys_reset (#96)

* update rust * update cortex-m fork * travis: improve rust-toolchain conflict message
ah- · Apr 13, 2019 · 73f4d4e · 73f4d4e
1 parent 700351f
commit 73f4d4e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: rust
-rust: nightly-2019-02-27
+rust: nightly-2019-03-22
 os:
   - linux
   - osx
@@ -30,7 +30,7 @@ before_install:
     rust_toolchain="$(cat rust-toolchain)"
     travis_yml="$(grep '^rust: ' .travis.yml | head -n 1 | sed -E 's/^rust: //')"
     if [[ $travis_yml != $rust_toolchain ]]; then
-      echo "error: the nightly version in $1 is different than the one in rust-toolchain!" 1>&2
+      echo "error: the rust version in travis is different from the one in rust-toolchain!" 1>&2
       exit 1
     fi
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-02-27
+nightly-2019-03-22
diff --git a/src/keyboard.rs b/src/keyboard.rs
@@ -69,7 +69,7 @@ impl Keyboard {
                     let action = self.get_action(key);
                     if pressed && Action::Reset == action {
                         crate::heprintln!("system reset").ok();
-                        SCB::system_reset2()
+                        SCB::sys_reset()
                     }
                     if pressed && Action::UsbToggle == action {
                         self.send_usb_report = !self.send_usb_report;