Skip to content

Commit

Permalink
Raise minimum compiler for test suite to 1.77
Browse files Browse the repository at this point in the history
  • Loading branch information
dtolnay committed Feb 5, 2025
1 parent 7e1e42b commit 6a217fc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [nightly, beta, stable, 1.82.0, 1.74.0, 1.73.0]
rust: [nightly, beta, stable, 1.82.0, 1.77.0, 1.74.0, 1.73.0]
os: [ubuntu]
include:
- name: Cargo on macOS
Expand Down Expand Up @@ -63,6 +63,7 @@ jobs:
if: matrix.os == 'macos'
- run: cargo run --manifest-path demo/Cargo.toml
- run: cargo test --workspace ${{steps.testsuite.outputs.exclude}}
if: matrix.rust != '1.74.0' && matrix.rust != '1.73.0'
- run: cargo check --no-default-features --features alloc
env:
RUSTFLAGS: --cfg compile_error_if_std ${{env.RUSTFLAGS}}
Expand Down
6 changes: 1 addition & 5 deletions tests/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@ fn test_c_return() {
assert_eq!("2020", ffi::c_return_rust_string());
assert_eq!("Hello \u{fffd}World", ffi::c_return_rust_string_lossy());
assert_eq!("2020", ffi::c_return_unique_ptr_string().to_str().unwrap());
// TODO: Use C-string literal c"2020" once MSRV is v1.77+
assert_eq!(
CStr::from_bytes_with_nul(b"2020\0").unwrap(),
ffi::c_return_unique_ptr_string().as_c_str(),
);
assert_eq!(c"2020", ffi::c_return_unique_ptr_string().as_c_str());
assert_eq!(4, ffi::c_return_unique_ptr_vector_u8().len());
assert_eq!(
200_u8,
Expand Down

0 comments on commit 6a217fc

Please sign in to comment.