Merge branch 'infrastructure' into develop

johngigantic · Oct 19, 2023 · a9c33a7 · a9c33a7
2 parents 94ac083 + 3f14449
commit a9c33a7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,12 +41,6 @@ jobs:
         include:
           - rust: nightly
             components: rustc-dev
-          - rust: nightly
-            name: ARM64
-            target: aarch64-unknown-none
-          - rust: nightly
-            name: ThumbV7
-            target: thumbv7m-none-eabi
           - rust: nightly
             name: Windows
             os: windows
@@ -62,7 +56,6 @@ jobs:
           components: ${{matrix.components}}
       - run: cargo check ${{env.target}} --no-default-features
       - run: cargo check ${{env.target}}
-      - run: cargo check ${{env.target}} --features full
       - if: matrix.components == 'rustc-dev'
         run: cargo check --benches --all-features --release
 
@@ -91,8 +84,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
-      - uses: dtolnay/install@cargo-docs-rs
-      - run: cargo docs-rs
+      - run: cargo doc
       - run: cargo test --all-features --doc
 
   minimal:

diff --git a/drivers/Cargo.toml b/drivers/Cargo.toml
@@ -19,3 +19,9 @@ categories = ["no-std", "embedded", "hardware-support", "science::robotics"]
 
 [dependencies]
 bilge = "0.2.0"
+
+# TODO: remove proc-macro-error from dependencies.
+# proc-macro-error is not a direct dependency of this crate, but a dependency of bilge.
+# It has a bug in v1.0.0, but bilge permissively allows v1.0.0 as the minimum dependency.
+# The statement here is to restrict proc-macro-error to v1.0.4 at minimum.
+proc-macro-error = "1.0.4"
diff --git a/drivers/src/lib.rs b/drivers/src/lib.rs
@@ -6,17 +6,17 @@ pub mod a49xx;
 pub mod amt49xxx;
 pub mod io;
 
-pub fn add(left: usize, right: usize) -> usize {
-    left + right
-}
+// pub fn add(left: usize, right: usize) -> usize {
+//     left + right
+// }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
+// #[cfg(test)]
+// mod tests {
+//     use super::*;
 
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
-}
+//     #[test]
+//     fn it_works() {
+//         let result = add(2, 2);
+//         assert_eq!(result, 4);
+//     }
+// }