Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 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,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
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"
1 change: 1 addition & 0 deletions rust/assert_no_alloc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
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
Loading