Browse Source

Compatibility fixes for Rust nightly (1.10.0)

pull/10/head
Fenrir 9 years ago
parent
commit
2bd6509b4f
  1. 2
      3ds.json
  2. 4
      Cargo.toml
  3. 2
      src/lib.rs
  4. 1
      src/raw/console.rs
  5. 1
      src/raw/mod.rs

2
3ds.json

@ -1,5 +1,5 @@
{ {
"data-layout": "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a:0:64-n32-m:e", "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64",
"llvm-target": "arm-none-eabihf", "llvm-target": "arm-none-eabihf",
"linker": "arm-none-eabi-g++", "linker": "arm-none-eabi-g++",
"ar": "arm-none-eabi-ar", "ar": "arm-none-eabi-ar",

4
Cargo.toml

@ -1,8 +1,8 @@
[package] [package]
name = "ctru-rs" name = "ctru-rs"
version = "0.1.0" version = "0.1.1"
description = "A safe wrapper around smealum's ctrulib." description = "A safe wrapper around smealum's ctrulib."
authors = ["Ronald Kinard <furyhunter600@gmail.com>"] authors = ["Ronald Kinard <furyhunter600@gmail.com>", "FenrirWolf <fenrirwolf@gmail.com>"]
links = "ctru" links = "ctru"
build = "build.rs" build = "build.rs"
license = "https://en.wikipedia.org/wiki/Zlib_License" license = "https://en.wikipedia.org/wiki/Zlib_License"

2
src/lib.rs

@ -1,4 +1,3 @@
#![feature(no_std)]
#![feature(lang_items)] #![feature(lang_items)]
#![no_std] #![no_std]
#![crate_type = "rlib"] #![crate_type = "rlib"]
@ -19,6 +18,5 @@ pub use srv::Srv;
pub use gfx::Gfx; pub use gfx::Gfx;
pub use sdmc::Sdmc; pub use sdmc::Sdmc;
#[lang = "stack_exhausted"] extern fn stack_exhausted() {}
#[lang = "eh_personality"] extern fn eh_personality() {} #[lang = "eh_personality"] extern fn eh_personality() {}
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} } #[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }

1
src/raw/console.rs

@ -10,7 +10,6 @@ pub struct ConsoleFont {
pub numChars: u16, pub numChars: u16,
} }
#[repr(C)]
pub type ConsolePrint = extern "C" fn(con: *mut c_void, c: i32) -> u8; pub type ConsolePrint = extern "C" fn(con: *mut c_void, c: i32) -> u8;
#[repr(C)] #[repr(C)]

1
src/raw/mod.rs

@ -1,7 +1,6 @@
#![allow(non_camel_case_types)] #![allow(non_camel_case_types)]
#![allow(non_snake_case)] #![allow(non_snake_case)]
#![allow(overflowing_literals)] #![allow(overflowing_literals)]
#![allow(raw_pointer_derive)]
pub mod console; pub mod console;
pub mod gfx; pub mod gfx;

Loading…
Cancel
Save