fixing build (#6)

Author: mikea

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable, 1.67.0, 1.70.0, 1.74.0]
+        rust: [nightly, beta, stable, 1.70.0, 1.74.0]
         os: [ubuntu]
         include:
           - name: Cargo on macOS
@@ -60,13 +60,6 @@ jobs:
         shell: bash
       - run: cargo run --manifest-path demo/Cargo.toml
       - run: cargo test --workspace ${{steps.testsuite.outputs.exclude}}
-        if: matrix.rust != '1.67.0'
-      - run: cargo check --no-default-features --features alloc
-        env:
-          RUSTFLAGS: --cfg compile_error_if_std ${{env.RUSTFLAGS}}
-      - run: cargo check --no-default-features
-        env:
-          RUSTFLAGS: --cfg compile_error_if_alloc --cfg cxx_experimental_no_alloc ${{env.RUSTFLAGS}}
       - uses: actions/upload-artifact@v4
         if: matrix.os == 'ubuntu' && matrix.rust == 'nightly' && always()
         with:

demo/src/main.rs

@@ -10,7 +10,8 @@ mod ffi {
     extern "Rust" {
         type MultiBuf;
 
-        fn next_chunk(buf: &mut MultiBuf) -> &[u8];
+        #[allow(clippy::needless_lifetimes)]
+        unsafe fn next_chunk<'a>(buf: &'a mut MultiBuf) -> &'a [u8];
     }
 
     // C++ types and signatures exposed to Rust.

tests/ui/bad_explicit_impl.rs

@@ -4,7 +4,7 @@ mod ffi {
         x: u8,
     }
 
-    impl fn() -> &S {}
+    impl<'a> fn() -> &'a S {}
 }
 
 fn main() {}

tests/ui/bad_explicit_impl.stderr

@@ -1,5 +1,5 @@
 error: unsupported Self type of explicit impl
  --> tests/ui/bad_explicit_impl.rs:7:5
   |
-7 |     impl fn() -> &S {}
-  |     ^^^^^^^^^^^^^^^^^^
+7 |     impl<'a> fn() -> &'a S {}
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/mut_return.rs

@@ -7,11 +7,11 @@ mod ffi {
     unsafe extern "C++" {
         type Thing;
 
-        fn f(t: &Thing) -> Pin<&mut CxxString>;
-        unsafe fn g(t: &Thing) -> Pin<&mut CxxString>;
-        fn h(t: Box<Mut>) -> Pin<&mut CxxString>;
+        fn f<'a>(t: &'a Thing) -> Pin<&'a mut CxxString>;
+        unsafe fn g<'a>(t: &'a Thing) -> Pin<&'a mut CxxString>;
+        fn h<'a>(t: Box<Mut>) -> Pin<&'a mut CxxString>;
         fn i<'a>(t: Box<Mut<'a>>) -> Pin<&'a mut CxxString>;
-        fn j(t: &Thing) -> &mut [u8];
+        fn j<'a>(t: &'a Thing) -> &'a mut [u8];
     }
 }
 

tests/ui/mut_return.stderr

@@ -1,11 +1,11 @@
 error: &mut return type is not allowed unless there is a &mut argument
   --> tests/ui/mut_return.rs:10:9
    |
-10 |         fn f(t: &Thing) -> Pin<&mut CxxString>;
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+10 |         fn f<'a>(t: &'a Thing) -> Pin<&'a mut CxxString>;
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: &mut return type is not allowed unless there is a &mut argument
   --> tests/ui/mut_return.rs:14:9
    |
-14 |         fn j(t: &Thing) -> &mut [u8];
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+14 |         fn j<'a>(t: &'a Thing) -> &'a mut [u8];
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/ptr_unsupported.rs

@@ -3,7 +3,7 @@ mod ffi {
     unsafe extern "C++" {
         type C;
 
-        fn get_ptr_to_reference() -> *mut &C;
+        fn get_ptr_to_reference<'a>() -> *mut &'a C;
         fn get_uniqueptr_to_ptr() -> UniquePtr<*mut C>;
         fn get_vector_of_ptr() -> UniquePtr<CxxVector<*mut C>>;
     }

tests/ui/ptr_unsupported.stderr

@@ -1,8 +1,8 @@
 error: C++ does not allow pointer to reference as a type
  --> tests/ui/ptr_unsupported.rs:6:38
   |
-6 |         fn get_ptr_to_reference() -> *mut &C;
-  |                                      ^^^^^^^
+6 |         fn get_ptr_to_reference<'a>() -> *mut &'a C;
+  |                                          ^^^^^^^^^^
 
 error: unsupported unique_ptr target type
  --> tests/ui/ptr_unsupported.rs:7:38