diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b6725b71..e7d233ec9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,9 +12,9 @@ env: on: pull_request: - branches: [ "master" ] + branches: [ "master", "status" ] push: - branches: [ "master" ] + branches: [ "master", "status" ] jobs: build: @@ -31,6 +31,12 @@ jobs: # run: cargo test --no-run #- name: Run tests # run: cargo test + - name: Ensure Miri is installed + run: rustup component add miri - name: Build run: cargo build - + # Need to fix ibig tests first. + # - name: Build + # run: cargo test + # - name: Build + # run: cargo miri test diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 9a5d38572..c6044c425 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -3,4 +3,4 @@ # If we need to change to nightly please # note the reason why in this comment. # channel = "1.77.0" -channel = "nightly-2024-04-19" +channel = "nightly-2024-12-01" diff --git a/rust/assert_no_alloc/src/lib.rs b/rust/assert_no_alloc/src/lib.rs index 4e9d5c7f3..66b8f639c 100644 --- a/rust/assert_no_alloc/src/lib.rs +++ b/rust/assert_no_alloc/src/lib.rs @@ -173,6 +173,7 @@ pub struct AllocDisabler; #[cfg(not(all(feature = "disable_release", not(debug_assertions))))] // if not disabled impl AllocDisabler { + #[allow(unused_variables)] fn check(&self, layout: Layout) { let forbid_count = ALLOC_FORBID_COUNT.with(|f| f.get()); let permit_count = ALLOC_PERMIT_COUNT.with(|p| p.get()); diff --git a/rust/sword/benches/cue_pill.rs b/rust/sword/benches/cue_pill.rs index 6553dc97f..9460860be 100644 --- a/rust/sword/benches/cue_pill.rs +++ b/rust/sword/benches/cue_pill.rs @@ -15,7 +15,7 @@ fn main() -> io::Result<()> { let in_len = f.metadata()?.len(); let mut stack = NockStack::new(1 << 10 << 10 << 10, 0); let jammed_input = unsafe { - let in_map = memmap::Mmap::map(&f)?; + let in_map = memmap2::Mmap::map(&f)?; let word_len = (in_len + 7) >> 3; let (mut atom, dest) = IndirectAtom::new_raw_mut(&mut stack, word_len as usize); write_bytes(dest.add(word_len as usize - 1), 0, 8); @@ -61,7 +61,7 @@ fn main() -> io::Result<()> { .open(output_filename)?; f_out.set_len((jammed_output.size() << 3) as u64)?; unsafe { - let mut out_map = memmap::MmapMut::map_mut(&f_out)?; + let mut out_map = memmap2::MmapMut::map_mut(&f_out)?; copy_nonoverlapping( jammed_output.data_pointer() as *mut u8, out_map.as_mut_ptr(),