Merge pull request #419 from boozook/fix/residual+stable-feature

Various minor updates: * update toolchain * remove feature panic_info_message that has been stable since 1.81.0 * improve from_residual in sys
boozook · Sep 7, 2024 · a6ba105 · a6ba105
2 parents 3e616dc + 4caba5b
commit a6ba105
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/sys/Cargo.toml b/api/sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playdate-sys"
-version = "0.4.5"
+version = "0.4.6"
 build = "src/build.rs"
 readme = "README.md"
 description = "Low-level Playdate API bindings"

diff --git a/api/sys/src/lib.rs b/api/sys/src/lib.rs
@@ -4,8 +4,6 @@
 #![allow(internal_features)]
 #![feature(lang_items)]
 #![feature(core_intrinsics)]
-// panic
-#![cfg_attr(feature = "panic-handler", feature(panic_info_message))]
 // allocator
 #![cfg_attr(feature = "allocator", feature(alloc_error_handler))]
 #![cfg_attr(feature = "allocator", feature(allocator_api))]
@@ -122,13 +120,10 @@ mod entry_point_ctrl {
 		impl<E: Display> FromResidual<Result<Infallible, E>> for EventLoopCtrl {
 			#[track_caller]
 			fn from_residual(residual: Result<Infallible, E>) -> Self {
-				if let Err(err) = residual {
-					crate::println!("Error: {err}");
-					// panic!("{err}");
-					Self::Stop
-				} else {
-					Self::Continue
-				}
+				let Err(err) = residual;
+				crate::println!("Error: {err}");
+				// panic!("{err}");
+				Self::Stop
 			}
 		}
 	}

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-07-15"
+channel = "nightly-2024-09-07"
 profile = "minimal"
 targets = ["thumbv7em-none-eabihf"]
 components = [