Merge branch 'main' into portable-only

hkratz · hkratz · commit 8f845f2e0b97 · 2025-11-09T13:16:16.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,18 +16,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest, macos-13]
+        os: [ubuntu-latest, macos-latest, windows-latest, macos-15-intel]
         toolchain: ["1.38.0", "1.61.0", stable, beta, nightly]
         exclude:
           - os: macos-latest
             toolchain: "1.38.0" # macOS ARM64 is not supported by 1.38.0
-          - os: macos-13
+          - os: macos-15-intel
             toolchain: "1.38.0" # macOS is not supported by 1.38.0 (flexpect)
           - toolchain: "1.61.0" # only macos
         include:
           - os: macos-latest
             toolchain: "1.61.0"
-          - os: macos-13
+          - os: macos-15-intel
             toolchain: "1.61.0"
     env:
       RUSTFLAGS: "-D warnings"
diff --git a/bench/src/lib.rs b/bench/src/lib.rs
@@ -105,7 +105,7 @@ fn bench_late_error<M: Measurement>(c: &mut Criterion<M>, bench_fn: BenchFn) {
 }
 
 fn scale_to_one_mib(input: &[u8]) -> Vec<u8> {
-    input.repeat((1024 * 1024 + input.len() - 1) / input.len())
+    input.repeat((1024_usize * 1024).div_ceil(input.len()))
 }
 
 fn get_valid_slice_of_len_or_more(s: &[u8], len: usize) -> &[u8] {

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ fn bench_late_error<M: Measurement>(c: &mut Criterion<M>, bench_fn: BenchFn) {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`fn scale_to_one_mib(input: &[u8]) -> Vec<u8> {`
`108`		`- input.repeat((1024 * 1024 + input.len() - 1) / input.len())`
	`108`	`+ input.repeat((1024_usize * 1024).div_ceil(input.len()))`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`fn get_valid_slice_of_len_or_more(s: &[u8], len: usize) -> &[u8] {`