Also ignore error outputs on MSRV to further simplify UI tests.

PyO3 · May 21, 2023 · a2e25c0 · a2e25c0
1 parent 3e40fa5
commit a2e25c0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 41 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
         name: Prepare minimal package versions (MSRV only)
         run: nox -s set-minimal-package-versions
 
-      - if: inputs.rust == 'nightly'
+      - if: inputs.rust == 'nightly' || inputs.msrv == 'MSRV'
         name: Ignore changed error messages when using trybuild
         run: echo "TRYBUILD=overwrite" >> "$GITHUB_ENV"
 

diff --git a/tests/test_compile_error.rs b/tests/test_compile_error.rs
@@ -18,45 +18,31 @@ fn test_compile_errors() {
     t.compile_fail("tests/ui/invalid_pymethod_names.rs");
     t.compile_fail("tests/ui/invalid_pymodule_args.rs");
     t.compile_fail("tests/ui/reject_generics.rs");
-
-    tests_not_msrv(&t);
-    tests_nightly(&t);
-
-    #[rustversion::since(1.49)]
-    fn tests_not_msrv(t: &trybuild::TestCases) {
-        t.compile_fail("tests/ui/deprecations.rs");
-        t.compile_fail("tests/ui/invalid_closure.rs");
-        t.compile_fail("tests/ui/pyclass_send.rs");
-        t.compile_fail("tests/ui/invalid_argument_attributes.rs");
-        t.compile_fail("tests/ui/invalid_frompy_derive.rs");
-        t.compile_fail("tests/ui/static_ref.rs");
-        t.compile_fail("tests/ui/wrong_aspyref_lifetimes.rs");
-        t.compile_fail("tests/ui/invalid_pyfunctions.rs");
-        t.compile_fail("tests/ui/invalid_pymethods.rs");
-        #[cfg(Py_LIMITED_API)]
-        t.compile_fail("tests/ui/abi3_nativetype_inheritance.rs");
-        t.compile_fail("tests/ui/invalid_intern_arg.rs");
-        t.compile_fail("tests/ui/invalid_frozen_pyclass_borrow.rs");
-        t.compile_fail("tests/ui/invalid_pymethod_receiver.rs");
-        t.compile_fail("tests/ui/missing_intopy.rs");
-        t.compile_fail("tests/ui/invalid_result_conversion.rs");
-        t.compile_fail("tests/ui/not_send.rs");
-        t.compile_fail("tests/ui/not_send2.rs");
-        #[cfg(not(feature = "nightly"))]
-        t.compile_fail("tests/ui/not_send3.rs");
-        t.compile_fail("tests/ui/get_set_all.rs");
-    }
-
-    #[rustversion::before(1.49)]
-    fn tests_not_msrv(_t: &trybuild::TestCases) {}
-
-    #[cfg(feature = "nightly")]
-    fn tests_nightly(t: &trybuild::TestCases) {
-        t.compile_fail("tests/ui/not_send_auto_trait.rs");
-        t.compile_fail("tests/ui/not_send_auto_trait2.rs");
-        t.compile_fail("tests/ui/send_wrapper.rs");
-    }
-
+    t.compile_fail("tests/ui/deprecations.rs");
+    t.compile_fail("tests/ui/invalid_closure.rs");
+    t.compile_fail("tests/ui/pyclass_send.rs");
+    t.compile_fail("tests/ui/invalid_argument_attributes.rs");
+    t.compile_fail("tests/ui/invalid_frompy_derive.rs");
+    t.compile_fail("tests/ui/static_ref.rs");
+    t.compile_fail("tests/ui/wrong_aspyref_lifetimes.rs");
+    t.compile_fail("tests/ui/invalid_pyfunctions.rs");
+    t.compile_fail("tests/ui/invalid_pymethods.rs");
+    #[cfg(Py_LIMITED_API)]
+    t.compile_fail("tests/ui/abi3_nativetype_inheritance.rs");
+    t.compile_fail("tests/ui/invalid_intern_arg.rs");
+    t.compile_fail("tests/ui/invalid_frozen_pyclass_borrow.rs");
+    t.compile_fail("tests/ui/invalid_pymethod_receiver.rs");
+    t.compile_fail("tests/ui/missing_intopy.rs");
+    t.compile_fail("tests/ui/invalid_result_conversion.rs");
+    t.compile_fail("tests/ui/not_send.rs");
+    t.compile_fail("tests/ui/not_send2.rs");
+    t.compile_fail("tests/ui/get_set_all.rs");
     #[cfg(not(feature = "nightly"))]
-    fn tests_nightly(_t: &trybuild::TestCases) {}
+    t.compile_fail("tests/ui/not_send3.rs");
+    #[cfg(feature = "nightly")]
+    t.compile_fail("tests/ui/not_send_auto_trait.rs");
+    #[cfg(feature = "nightly")]
+    t.compile_fail("tests/ui/not_send_auto_trait2.rs");
+    #[cfg(feature = "nightly")]
+    t.compile_fail("tests/ui/send_wrapper.rs");
 }