test ci

PLSysSec · Oct 1, 2024 · 66b3149 · 66b3149
1 parent b203190
commit 66b3149
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,4 +6,10 @@
         "RUSTUP_TOOLCHAIN": "nightly-2024-07-08"
     },
     "rust-analyzer.check.allTargets": false,
+    "rust-analyzer.check.overrideCommand": [
+        "cargo",
+        "flux",
+        "--workspace",
+        "--message-format=json-diagnostic-rendered-ansi"
+      ]
 }
diff --git a/arch/rv32i/Cargo.toml b/arch/rv32i/Cargo.toml
@@ -17,7 +17,7 @@ flux_support = { path = "../../flux_support" }
 tock-registers = { path = "../../libraries/tock-register-interface" }
 riscv-csr = { path = "../../libraries/riscv-csr" }
 riscv = { path = "../riscv" }
-flux-rs = { git = "https://github.com/flux-rs/flux" }
+flux-rs = { git  = "https://github.com/flux-rs/flux.git" }
 
 [lints]
 workspace = true
diff --git a/capsules/system/src/process_checker/signature.rs b/capsules/system/src/process_checker/signature.rs
@@ -3,6 +3,7 @@
 // Copyright Tock Contributors 2024.
 //! Signature credential checker for checking process credentials.
 
+use flux_rs::*;
 use kernel::hil;
 use kernel::process_checker::CheckResult;
 use kernel::process_checker::{AppCredentialsPolicy, AppCredentialsPolicyClient};

diff --git a/chips/virtio/Cargo.toml b/chips/virtio/Cargo.toml
@@ -10,6 +10,7 @@ edition.workspace = true
 
 [dependencies]
 kernel = { path = "../../kernel" }
+flux-rs = { git = "https://github.com/flux-rs/flux" }
 
 [lints]
 workspace = true
diff --git a/kernel/src/deferred_call.rs b/kernel/src/deferred_call.rs
@@ -98,7 +98,7 @@ impl<'a> DynDefCallRef<'a> {
     #[flux_rs::trusted] // unsupported cast `PointerCoercion(ClosureFnPointer(Safe))`
     fn new<T: DeferredCallClient>(x: &'a T) -> Self {
         Self {
-            data: x as *const _ as *const (),
+            data: core::ptr::from_ref(x) as *const (),
             callback: |p| unsafe { T::handle_deferred_call(&*p.cast()) },
             _lifetime: PhantomData,
         }

diff --git a/shell.nix b/shell.nix
@@ -63,6 +63,7 @@ in
 
       # --- CI support packages ---
       qemu
+      z3
 
       # --- Flashing tools ---
       # If your board requires J-Link to flash and you are on NixOS,
@@ -88,5 +89,6 @@ in
     shellHook = ''
       unset OBJCOPY
       unset OBJDUMP
+      PATH=/home/mod/.local/bin:$PATH
     '';
   }