diff options
| author | panicbit <[email protected]> | 2017-07-11 03:21:47 +0200 |
|---|---|---|
| committer | panicbit <[email protected]> | 2017-07-11 03:21:47 +0200 |
| commit | 393ef5f8a9ad90cc7705f5900e70cd35fee9599d (patch) | |
| tree | 4fe3c3ec2c236a2c80537e7ebc5ae6a49df16775 /ctr-std/src/panicking.rs | |
| parent | Remove ctr-libc dep from ctr-std (diff) | |
| parent | Merge pull request #31 from FenrirWolf/ctrulib-update (diff) | |
| download | archived-ctru-rs-393ef5f8a9ad90cc7705f5900e70cd35fee9599d.tar.xz archived-ctru-rs-393ef5f8a9ad90cc7705f5900e70cd35fee9599d.zip | |
Merge branch 'master' into nightly_update
Diffstat (limited to 'ctr-std/src/panicking.rs')
| -rw-r--r-- | ctr-std/src/panicking.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctr-std/src/panicking.rs b/ctr-std/src/panicking.rs index efb828a..0de44be 100644 --- a/ctr-std/src/panicking.rs +++ b/ctr-std/src/panicking.rs @@ -63,8 +63,8 @@ pub fn begin_panic<M: Any + Send + Display>(msg: M, file_line: &(&'static str, u let msg = Box::new(msg); let (file, line) = *file_line; - use libctru::console::consoleInit; - use libctru::gfx::gfxScreen_t; + use libctru::consoleInit; + use libctru::gfxScreen_t; // set up a new console, overwriting whatever was on the top screen // before we started panicking @@ -74,7 +74,7 @@ pub fn begin_panic<M: Any + Send + Display>(msg: M, file_line: &(&'static str, u println!(" {}", msg); // Terminate the process to ensure that all threads cease when panicking. - unsafe { ::libctru::svc::svcExitProcess() } + unsafe { ::libctru::svcExitProcess() } // On 3DS hardware, code execution will have terminated at the above function. // |