Update nightly, fix cue_pill benchmark, fix CI/CD (#289)

* Update nightly, fix cue_pill benchmark, fix CI/CD

* Fix layout warning, temporarily disable tests until we can fix ibig
This commit is contained in:
Chris A. 2024-12-11 18:19:00 -06:00 committed by GitHub
parent 92fa0f864b
commit 980533198b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 6 deletions

View File

@ -12,9 +12,9 @@ env:
on: on:
pull_request: pull_request:
branches: [ "master" ] branches: [ "master", "status" ]
push: push:
branches: [ "master" ] branches: [ "master", "status" ]
jobs: jobs:
build: build:
@ -31,6 +31,12 @@ jobs:
# run: cargo test --no-run # run: cargo test --no-run
#- name: Run tests #- name: Run tests
# run: cargo test # run: cargo test
- name: Ensure Miri is installed
run: rustup component add miri
- name: Build - name: Build
run: cargo build run: cargo build
# Need to fix ibig tests first.
# - name: Build
# run: cargo test
# - name: Build
# run: cargo miri test

View File

@ -3,4 +3,4 @@
# If we need to change to nightly please # If we need to change to nightly please
# note the reason why in this comment. # note the reason why in this comment.
# channel = "1.77.0" # channel = "1.77.0"
channel = "nightly-2024-04-19" channel = "nightly-2024-12-01"

View File

@ -173,6 +173,7 @@ pub struct AllocDisabler;
#[cfg(not(all(feature = "disable_release", not(debug_assertions))))] // if not disabled #[cfg(not(all(feature = "disable_release", not(debug_assertions))))] // if not disabled
impl AllocDisabler { impl AllocDisabler {
#[allow(unused_variables)]
fn check(&self, layout: Layout) { fn check(&self, layout: Layout) {
let forbid_count = ALLOC_FORBID_COUNT.with(|f| f.get()); let forbid_count = ALLOC_FORBID_COUNT.with(|f| f.get());
let permit_count = ALLOC_PERMIT_COUNT.with(|p| p.get()); let permit_count = ALLOC_PERMIT_COUNT.with(|p| p.get());

View File

@ -15,7 +15,7 @@ fn main() -> io::Result<()> {
let in_len = f.metadata()?.len(); let in_len = f.metadata()?.len();
let mut stack = NockStack::new(1 << 10 << 10 << 10, 0); let mut stack = NockStack::new(1 << 10 << 10 << 10, 0);
let jammed_input = unsafe { 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 word_len = (in_len + 7) >> 3;
let (mut atom, dest) = IndirectAtom::new_raw_mut(&mut stack, word_len as usize); 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); write_bytes(dest.add(word_len as usize - 1), 0, 8);
@ -61,7 +61,7 @@ fn main() -> io::Result<()> {
.open(output_filename)?; .open(output_filename)?;
f_out.set_len((jammed_output.size() << 3) as u64)?; f_out.set_len((jammed_output.size() << 3) as u64)?;
unsafe { unsafe {
let mut out_map = memmap::MmapMut::map_mut(&f_out)?; let mut out_map = memmap2::MmapMut::map_mut(&f_out)?;
copy_nonoverlapping( copy_nonoverlapping(
jammed_output.data_pointer() as *mut u8, jammed_output.data_pointer() as *mut u8,
out_map.as_mut_ptr(), out_map.as_mut_ptr(),