diff options
| author | Vivian Lim <[email protected]> | 2021-02-05 23:09:43 -0800 |
|---|---|---|
| committer | Vivian Lim <[email protected]> | 2021-02-05 23:09:43 -0800 |
| commit | 1fc377175fff62b26469ab21e70fad728a0337a9 (patch) | |
| tree | 1771c8e5d672fbf5f38565678ff9639bc4878fe1 | |
| parent | changes so that this can build (diff) | |
| download | ctru-rs-1fc377175fff62b26469ab21e70fad728a0337a9.tar.xz ctru-rs-1fc377175fff62b26469ab21e70fad728a0337a9.zip | |
tweaks to get it to attempt linking
| -rw-r--r-- | ctr-std/Cargo.toml | 2 | ||||
| -rw-r--r-- | ctr-std/src/lib.rs | 3 | ||||
| -rw-r--r-- | ctr-std/src/os/raw/mod.rs | 24 |
3 files changed, 14 insertions, 15 deletions
diff --git a/ctr-std/Cargo.toml b/ctr-std/Cargo.toml index 3424485..ec682e2 100644 --- a/ctr-std/Cargo.toml +++ b/ctr-std/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" license = "MIT/Apache 2.0" [dependencies.alloc_system] -git = "https://github.com/rust3ds/alloc_system3ds" +path = "../../alloc_system3ds" [dependencies.ctru-sys] path = "../ctru-sys" diff --git a/ctr-std/src/lib.rs b/ctr-std/src/lib.rs index 19ea930..8fdad90 100644 --- a/ctr-std/src/lib.rs +++ b/ctr-std/src/lib.rs @@ -274,7 +274,6 @@ #![feature(never_type)] #![cfg_attr(not(stage0), feature(nll))] #![feature(exhaustive_patterns)] -#![feature(on_unimplemented)] #![feature(optin_builtin_traits)] #![feature(panic_internals)] #![feature(panic_unwind)] @@ -309,7 +308,7 @@ #![feature(doc_alias)] #![feature(doc_keyword)] #![feature(panic_info_message)] -#![feature(panic_implementation)] +#![feature(panic_handler)] #![feature(non_exhaustive)] #![default_lib_allocator] diff --git a/ctr-std/src/os/raw/mod.rs b/ctr-std/src/os/raw/mod.rs index dc33747..7a2d29c 100644 --- a/ctr-std/src/os/raw/mod.rs +++ b/ctr-std/src/os/raw/mod.rs @@ -50,17 +50,17 @@ use fmt; all(target_os = "openbsd", target_arch = "aarch64"), all(target_os = "fuchsia", target_arch = "aarch64"))))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8; -#[doc(include = "os/raw/schar.md")] +#[doc(include = "schar.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_schar = i8; -#[doc(include = "os/raw/uchar.md")] +#[doc(include = "uchar.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_uchar = u8; -#[doc(include = "os/raw/short.md")] +#[doc(include = "short.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_short = i16; -#[doc(include = "os/raw/ushort.md")] +#[doc(include = "ushort.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_ushort = u16; -#[doc(include = "os/raw/int.md")] +#[doc(include = "int.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_int = i32; -#[doc(include = "os/raw/uint.md")] +#[doc(include = "uint.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_uint = u32; #[doc(include = "os/raw/long.md")] #[cfg(any(target_pointer_width = "32", windows))] @@ -68,19 +68,19 @@ use fmt; #[doc(include = "os/raw/ulong.md")] #[cfg(any(target_pointer_width = "32", windows))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_ulong = u32; -#[doc(include = "os/raw/long.md")] +#[doc(include = "long.md")] #[cfg(all(target_pointer_width = "64", not(windows)))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_long = i64; -#[doc(include = "os/raw/ulong.md")] +#[doc(include = "ulong.md")] #[cfg(all(target_pointer_width = "64", not(windows)))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_ulong = u64; -#[doc(include = "os/raw/longlong.md")] +#[doc(include = "longlong.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_longlong = i64; -#[doc(include = "os/raw/ulonglong.md")] +#[doc(include = "ulonglong.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_ulonglong = u64; -#[doc(include = "os/raw/float.md")] +#[doc(include = "float.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_float = f32; -#[doc(include = "os/raw/double.md")] +#[doc(include = "double.md")] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_double = f64; /// Equivalent to C's `void` type when used as a [pointer]. |