Try some CI fixes after Cargo.toml changes

.github/workflows/ci.yml

@@ -43,15 +43,11 @@ jobs:
       - name: Check formatting
         run: cargo fmt --all --verbose -- --check
 
-      # We always run the next two steps, so that even if formatting fails we
+      # We always run the next step, so that even if formatting fails we
       # still get compilation errors for the same run (mainly for matchers).
 
-      - name: Cargo check ctru-sys (without tests)
-        run: cargo 3ds clippy --package ctru-sys --color=always --verbose
-        if: success() || failure()
-
-      - name: Cargo check ctru-rs (including tests)
-        run: cargo 3ds clippy --package ctru-rs --color=always --verbose --all-targets
+      - name: Cargo check workspace (including tests / examples)
+        run: cargo 3ds clippy --workspace --color=always --verbose --all-targets
         if: success() || failure()
 
   test:
@@ -80,17 +76,21 @@ jobs:
       # unless cargo-3ds actually runs them as separate commands. See
       # https://github.com/rust3ds/cargo-3ds/issues/44 for more details
       - name: Build lib and integration tests
-        run: cargo 3ds test --no-run --tests --all-features
+        # Hmm, I guess we really do need to build each target separately due to the above issue:
+        run: |
+          cargo 3ds test --no-run --lib --all-features --package ctru-sys
+          cargo 3ds test --no-run --test layout_test --all-features --package ctru-sys
+          cargo 3ds test --no-run --lib --all-features --package ctru-rs
 
       - name: Run lib and integration tests
         uses: rust3ds/test-runner/run-tests@v1
         with:
-          args: --tests --all-features
+          args: --tests --all-features --workspace
 
       - name: Build and run doc tests
         uses: rust3ds/test-runner/run-tests@v1
         with:
-          args: --doc
+          args: --doc --workspace
 
       - name: Upload citra logs and capture videos
         uses: actions/upload-artifact@v3

ctru-rs/Cargo.toml

@@ -22,7 +22,7 @@ ctru-sys = { path = "../ctru-sys", version = "0.5.0" }
 const-zero = "0.1.0"
 shim-3ds = { workspace = true }
 pthread-3ds = { workspace = true }
-libc = { workspace = true }
+libc = { workspace = true, default-features = true }
 bitflags = "2.3.3"
 macaddr = "1.0.1"
 widestring = "1.0.2"

ctru-rs/build.rs

@@ -24,6 +24,7 @@ fn main() {
     let romfs_path = PathBuf::from(format!("{manifest_dir}/{romfs_dir_setting}"));
 
     // Check if the romfs path exists so we can compile the module
+    println!("cargo:rustc-check-cfg=cfg(romfs_exists)");
     if romfs_path.exists() {
         println!("cargo:rustc-cfg=romfs_exists");
     }

ctru-sys/Cargo.toml

@@ -26,7 +26,6 @@ layout-tests = [
 ]
 
 [[test]]
-path = "tests/layout_test.rs"
 name = "layout_test"
 required-features = ["layout-tests"]
 

ctru-sys/build.rs

@@ -170,7 +170,6 @@ fn main() {
             .blocklist_type("MiiData.*")
             .blocklist_type("ExHeader_(System|Arm11).*")
             .blocklist_type("FS_((Ext|System)SaveData|Program)Info")
-            .blocklist_type("FS_ProgramInfo")
             .blocklist_type("Y2RU_ConversionParams")
             .blocklist_field("romfs_(dir|file)", "name")
             // Bindgen generated types have no c++ equivalent:

ctru-sys/build/test_gen.rs

@@ -17,7 +17,6 @@ use bindgen::callbacks::{
 use bindgen::FieldVisibilityKind;
 use proc_macro2::TokenStream;
 use quote::{format_ident, quote, TokenStreamExt};
-
 use regex::Regex;
 use rust_format::{Formatter, RustFmt};