Skip to content

Commit 889f04b

Browse files
committed
try_exists was stabilized as ::exists
1 parent 307c945 commit 889f04b

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

crates/0-std-tests/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(fs_try_exists)]
2-
31
mod tests_fs;
42
mod tests_pthread;
53
mod tests_tcp;

crates/0-std-tests/src/tests_fs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mod tests {
66

77
impl Drop for FsScope {
88
fn drop(&mut self) {
9-
if fs::try_exists("ux0:/data/.rust_test").unwrap_or(false) {
9+
if fs::exists("ux0:/data/.rust_test").unwrap_or(false) {
1010
fs::remove_dir_all("ux0:/data/.rust_test").expect("unable to cleanup");
1111
}
1212
}
@@ -54,7 +54,7 @@ mod tests {
5454
assert!(&data == "contents", "invalid file contents");
5555

5656
assert!(
57-
fs::try_exists("ux0:/data/.rust_test/file").unwrap(),
57+
fs::exists("ux0:/data/.rust_test/file").unwrap(),
5858
"file does not exist",
5959
);
6060

@@ -69,7 +69,7 @@ mod tests {
6969

7070
fs::remove_file("ux0:/data/.rust_test/file").expect("unable to delete file");
7171
assert!(
72-
!fs::try_exists("ux0:/data/.rust_test/file").unwrap(),
72+
!fs::exists("ux0:/data/.rust_test/file").unwrap(),
7373
"file exists, but should not",
7474
);
7575

crates/3-sdl/src/main.rs

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
// These linker flags are only necessary with Northfear SDL2 fork
2+
#[link(name = "SDL2", kind = "static")]
3+
#[link(name = "vitaGL", kind = "static")]
4+
#[link(name = "vitashark", kind = "static")]
5+
#[link(name = "SceShaccCg_stub", kind = "static")]
6+
#[link(name = "mathneon", kind = "static")]
7+
#[link(name = "SceShaccCgExt", kind = "static")]
8+
#[link(name = "taihen_stub", kind = "static")]
9+
#[link(name = "SceKernelDmacMgr_stub", kind = "static")]
10+
#[link(name = "SceIme_stub", kind = "static")]
11+
extern "C" {}
12+
13+
114
use crate::game_of_life::{PLAYGROUND_HEIGHT, PLAYGROUND_WIDTH, SQUARE_SIZE};
215
use sdl2::keyboard::Keycode;
316
use sdl2::mouse::MouseButton;

crates/4-vitasdk/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::backtrace::Backtrace;
22
use std::fmt::Write;
3-
use std::panic::{self, PanicInfo};
3+
use std::panic::{self, PanicHookInfo};
44
use std::thread;
55
use std::time::Duration;
66

@@ -25,7 +25,7 @@ pub fn main() {
2525
thread::sleep(Duration::from_secs(5));
2626
}
2727

28-
fn custom_panic_hook(info: &PanicInfo<'_>) {
28+
fn custom_panic_hook(info: &PanicHookInfo<'_>) {
2929
// The current implementation always returns `Some`.
3030
let location = info.location().unwrap();
3131

0 commit comments

Comments
 (0)