Skip to content

Commit

Permalink
Update nightly, fix cue_pill benchmark, fix CI/CD
Browse files Browse the repository at this point in the history
  • Loading branch information
bitemyapp committed Dec 11, 2024
1 parent 92fa0f8 commit fed2ce2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ env:

on:
pull_request:
branches: [ "master" ]
branches: [ "master", "status" ]
push:
branches: [ "master" ]
branches: [ "master", "status" ]

jobs:
build:
Expand All @@ -31,6 +31,11 @@ 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

- name: Build
run: cargo test
- name: Build
run: cargo miri test
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions rust/sword/benches/cue_pill.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(),
Expand Down

0 comments on commit fed2ce2

Please sign in to comment.