aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFenrir <[email protected]>2016-04-27 19:27:52 -0700
committerFenrir <[email protected]>2016-04-27 19:27:52 -0700
commit2bd6509b4f647f0669374dfc0352fcf782da8b41 (patch)
treecf31fa14578c1f7f038c21d8251426c2963f996c
parentWhoops, that's zlib, not BSD-3. (diff)
downloadctru-rs-2bd6509b4f647f0669374dfc0352fcf782da8b41.tar.xz
ctru-rs-2bd6509b4f647f0669374dfc0352fcf782da8b41.zip
Compatibility fixes for Rust nightly (1.10.0)
-rw-r--r--3ds.json2
-rw-r--r--Cargo.toml4
-rw-r--r--src/lib.rs2
-rw-r--r--src/raw/console.rs1
-rw-r--r--src/raw/mod.rs1
5 files changed, 3 insertions, 7 deletions
diff --git a/3ds.json b/3ds.json
index 0e863d1..a54295d 100644
--- a/3ds.json
+++ b/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",
"linker": "arm-none-eabi-g++",
"ar": "arm-none-eabi-ar",
diff --git a/Cargo.toml b/Cargo.toml
index f026c1c..df91803 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "ctru-rs"
-version = "0.1.0"
+version = "0.1.1"
description = "A safe wrapper around smealum's ctrulib."
-authors = ["Ronald Kinard <[email protected]>"]
+authors = ["Ronald Kinard <[email protected]>", "FenrirWolf <[email protected]>"]
links = "ctru"
build = "build.rs"
license = "https://en.wikipedia.org/wiki/Zlib_License"
diff --git a/src/lib.rs b/src/lib.rs
index 65fbda3..767f03d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(no_std)]
#![feature(lang_items)]
#![no_std]
#![crate_type = "rlib"]
@@ -19,6 +18,5 @@ pub use srv::Srv;
pub use gfx::Gfx;
pub use sdmc::Sdmc;
-#[lang = "stack_exhausted"] extern fn stack_exhausted() {}
#[lang = "eh_personality"] extern fn eh_personality() {}
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }
diff --git a/src/raw/console.rs b/src/raw/console.rs
index 8871c7f..bbf3a30 100644
--- a/src/raw/console.rs
+++ b/src/raw/console.rs
@@ -10,7 +10,6 @@ pub struct ConsoleFont {
pub numChars: u16,
}
-#[repr(C)]
pub type ConsolePrint = extern "C" fn(con: *mut c_void, c: i32) -> u8;
#[repr(C)]
diff --git a/src/raw/mod.rs b/src/raw/mod.rs
index f4947a7..0975001 100644
--- a/src/raw/mod.rs
+++ b/src/raw/mod.rs
@@ -1,7 +1,6 @@
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]
#![allow(overflowing_literals)]
-#![allow(raw_pointer_derive)]
pub mod console;
pub mod gfx;