From b593b90701d9c85311aeb9d31dce4afcf4696698 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Sun, 23 Jul 2023 19:52:11 +0100 Subject: [PATCH] Get the docs building --- agb/Cargo.toml | 3 +-- agb/src/sound/mixer/mod.rs | 2 +- agb/src/sync/statics.rs | 6 +++--- justfile | 4 ++-- tracker/agb-tracker/Cargo.toml | 3 +++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/agb/Cargo.toml b/agb/Cargo.toml index e1bd60a2..390bd225 100644 --- a/agb/Cargo.toml +++ b/agb/Cargo.toml @@ -23,8 +23,7 @@ bilge = "0.1" rustc-hash = { version = "1", default-features = false } [package.metadata.docs.rs] -default-target = "thumbv6m-none-eabi" -targets = [] +default-target = "thumbv4t-none-eabi" [profile.dev] opt-level = 3 diff --git a/agb/src/sound/mixer/mod.rs b/agb/src/sound/mixer/mod.rs index 1a7fe1c4..7cb4c055 100644 --- a/agb/src/sound/mixer/mod.rs +++ b/agb/src/sound/mixer/mod.rs @@ -334,7 +334,7 @@ impl SoundChannel { } /// Sets the point at which the sample should restart once it loops. Does nothing - /// unless you also call [`should_loop()`]. + /// unless you also call [`should_loop()`](SoundChannel::should_loop()). /// /// Useful if your song has an introduction or similar. #[inline(always)] diff --git a/agb/src/sync/statics.rs b/agb/src/sync/statics.rs index 68eb5030..e7828c6c 100644 --- a/agb/src/sync/statics.rs +++ b/agb/src/sync/statics.rs @@ -78,7 +78,7 @@ unsafe fn transfer_align4_thumb(mut dst: *mut T, mut src: *const T) { } } -#[cfg_attr(not(doc), instruction_set(arm::a32))] +#[instruction_set(arm::a32)] #[allow(unused_assignments)] unsafe fn transfer_align4_arm(mut dst: *mut T, mut src: *const T) { let size = mem::size_of::(); @@ -168,14 +168,14 @@ unsafe fn exchange(dst: *mut T, src: *const T) -> T { } } -#[cfg_attr(not(doc), instruction_set(arm::a32))] +#[instruction_set(arm::a32)] unsafe fn exchange_align4_arm(dst: *mut T, i: u32) -> u32 { let out; asm!("swp {2}, {1}, [{0}]", in(reg) dst, in(reg) i, lateout(reg) out); out } -#[cfg_attr(not(doc), instruction_set(arm::a32))] +#[instruction_set(arm::a32)] unsafe fn exchange_align1_arm(dst: *mut T, i: u8) -> u8 { let out; asm!("swpb {2}, {1}, [{0}]", in(reg) dst, in(reg) i, lateout(reg) out); diff --git a/justfile b/justfile index 9aa2687e..216bc75f 100644 --- a/justfile +++ b/justfile @@ -29,8 +29,8 @@ doctest-agb: (cd agb && cargo test --doc -Z doctest-xcompile) check-docs: - (cd agb && cargo doc --target=thumbv6m-none-eabi --no-deps) - (cd tracker/agb-tracker && cargo doc --target=thumbv6m-none-eabi --no-deps) + (cd agb && cargo doc --target=thumbv4t-none-eabi --no-deps) + (cd tracker/agb-tracker && cargo doc --target=thumbv4t-none-eabi --no-deps) just _build_docs agb-fixnum just _build_docs agb-hashmap diff --git a/tracker/agb-tracker/Cargo.toml b/tracker/agb-tracker/Cargo.toml index a70ed1ae..31b7b700 100644 --- a/tracker/agb-tracker/Cargo.toml +++ b/tracker/agb-tracker/Cargo.toml @@ -23,3 +23,6 @@ debug = true opt-level = 3 lto = "fat" debug = true + +[package.metadata.docs.rs] +default-target = "thumbv4t-none-eabi"