diff --git a/crates/0-std-tests/src/lib.rs b/crates/0-std-tests/src/lib.rs index dc3b9e2..893f7fd 100644 --- a/crates/0-std-tests/src/lib.rs +++ b/crates/0-std-tests/src/lib.rs @@ -1,5 +1,3 @@ -#![feature(fs_try_exists)] - mod tests_fs; mod tests_pthread; mod tests_tcp; diff --git a/crates/0-std-tests/src/tests_fs.rs b/crates/0-std-tests/src/tests_fs.rs index 3c058d3..9a74a1d 100644 --- a/crates/0-std-tests/src/tests_fs.rs +++ b/crates/0-std-tests/src/tests_fs.rs @@ -6,7 +6,7 @@ mod tests { impl Drop for FsScope { fn drop(&mut self) { - if fs::try_exists("ux0:/data/.rust_test").unwrap_or(false) { + if fs::exists("ux0:/data/.rust_test").unwrap_or(false) { fs::remove_dir_all("ux0:/data/.rust_test").expect("unable to cleanup"); } } @@ -54,7 +54,7 @@ mod tests { assert!(&data == "contents", "invalid file contents"); assert!( - fs::try_exists("ux0:/data/.rust_test/file").unwrap(), + fs::exists("ux0:/data/.rust_test/file").unwrap(), "file does not exist", ); @@ -69,7 +69,7 @@ mod tests { fs::remove_file("ux0:/data/.rust_test/file").expect("unable to delete file"); assert!( - !fs::try_exists("ux0:/data/.rust_test/file").unwrap(), + !fs::exists("ux0:/data/.rust_test/file").unwrap(), "file exists, but should not", ); diff --git a/crates/3-sdl/src/main.rs b/crates/3-sdl/src/main.rs index 5ab4b82..0f559ae 100644 --- a/crates/3-sdl/src/main.rs +++ b/crates/3-sdl/src/main.rs @@ -1,3 +1,16 @@ +// These linker flags are only necessary with Northfear SDL2 fork +#[link(name = "SDL2", kind = "static")] +#[link(name = "vitaGL", kind = "static")] +#[link(name = "vitashark", kind = "static")] +#[link(name = "SceShaccCg_stub", kind = "static")] +#[link(name = "mathneon", kind = "static")] +#[link(name = "SceShaccCgExt", kind = "static")] +#[link(name = "taihen_stub", kind = "static")] +#[link(name = "SceKernelDmacMgr_stub", kind = "static")] +#[link(name = "SceIme_stub", kind = "static")] +extern "C" {} + + use crate::game_of_life::{PLAYGROUND_HEIGHT, PLAYGROUND_WIDTH, SQUARE_SIZE}; use sdl2::keyboard::Keycode; use sdl2::mouse::MouseButton; diff --git a/crates/4-vitasdk/src/main.rs b/crates/4-vitasdk/src/main.rs index fb40137..a67e505 100644 --- a/crates/4-vitasdk/src/main.rs +++ b/crates/4-vitasdk/src/main.rs @@ -1,6 +1,6 @@ use std::backtrace::Backtrace; use std::fmt::Write; -use std::panic::{self, PanicInfo}; +use std::panic::{self, PanicHookInfo}; use std::thread; use std::time::Duration; @@ -25,7 +25,7 @@ pub fn main() { thread::sleep(Duration::from_secs(5)); } -fn custom_panic_hook(info: &PanicInfo<'_>) { +fn custom_panic_hook(info: &PanicHookInfo<'_>) { // The current implementation always returns `Some`. let location = info.location().unwrap();