Merged origin/main into jdblischak-update-3e-vignettes

Author: hadley

.github/workflows/R-CMD-check.yaml

@@ -8,7 +8,6 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
 name: R-CMD-check.yaml
 

.github/workflows/pkgdown.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
   release:
     types: [published]
   workflow_dispatch:

.github/workflows/test-coverage.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
 name: test-coverage.yaml
 
@@ -35,14 +34,16 @@ jobs:
             clean = FALSE,
             install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
+          print(cov)
           covr::to_cobertura(cov)
         shell: Rscript {0}
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
-          fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
-          file: ./cobertura.xml
-          plugin: noop
+          # Fail if error if not on PR, or if on PR and token is given
+          fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
+          files: ./cobertura.xml
+          plugins: noop
           disable_search: true
           token: ${{ secrets.CODECOV_TOKEN }}
 

DESCRIPTION

@@ -56,4 +56,4 @@ Config/testthat/parallel: true
 Config/testthat/start-first: watcher, parallel*
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE, r6 = FALSE)
-RoxygenNote: 7.3.2.9000
+RoxygenNote: 7.3.2

NEWS.md

@@ -1,5 +1,7 @@
 # testthat (development version)
 
+* Fixed an issue preventing compilation from succeeding due to deprecation / removal of `std::uncaught_exception()` (@kevinushey, #2047).
+
 # testthat 3.2.3
 
 * Fixed an issue where `expect_no_error(1)` was failing (#2037).

R/expect-known.R

@@ -215,5 +215,5 @@ expect_known_hash <- function(object, hash = NULL) {
 }
 
 all_utf8 <- function(x) {
-  ! any(is.na(iconv(x, "UTF-8", "UTF-8")))
+  !anyNA(iconv(x, "UTF-8", "UTF-8"))
 }

R/mock2.R

@@ -144,7 +144,7 @@ local_mocked_bindings <- function(..., .package = NULL, .env = caller_env()) {
     local_bindings_rebind(!!!bindings, .env = test_env, .frame = .env)
   }
 
-  if (any(!bindings_found)) {
+  if (!all(bindings_found)) {
     missing <- names(bindings)[!bindings_found]
     cli::cli_abort("Can't find binding for {.arg {missing}}")
   }

R/praise.R

@@ -21,8 +21,8 @@ praise <- function() {
     "\U0001f9ff Your tests look perfect \U0001f9ff",
     "\U0001f3af Your tests hit the mark \U0001f3af",
     "\U0001f41d Your tests are the bee's knees \U0001f41d",
-    "\U0001f4a3 Your tests are da bomb \U0001f4a3",
-    "\U0001f525 Your tests are lit \U0001f525"
+    "\U0001f3b8 Your tests rock \U0001f3b8",
+    "\U0001f44f Your tests get an ovation \U0001f44f"
   )
 
   x <- if (cli::is_utf8_output()) c(plain, utf8) else plain

R/reporter-list.R

@@ -126,7 +126,7 @@ all_passed <- function(res) {
   }
 
   df <- as.data.frame.testthat_results(res)
-  sum(df$failed) == 0 && all(!df$error)
+  sum(df$failed) == 0 && !any(df$error)
 }
 
 any_warnings <- function(res) {

inst/include/testthat/vendor/catch.h

@@ -379,6 +379,15 @@
 
 namespace Catch {
 
+    inline bool HasUncaughtException()
+    {
+#if __cplusplus >= 202002L
+        return std::uncaught_exceptions() > 0;
+#else
+        return std::uncaught_exception();
+#endif
+    }
+
     struct IConfig;
 
     struct CaseSensitive { enum Choice {
@@ -8379,7 +8388,7 @@ namespace Catch {
     {}
 
     ScopedMessage::~ScopedMessage() {
-        if ( !std::uncaught_exception() ){
+        if ( !HasUncaughtException() ){
             getResultCapture().popScopedMessage(m_info);
         }
     }
@@ -8702,7 +8711,7 @@ namespace Catch {
     Section::~Section() {
         if( m_sectionIncluded ) {
             SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() );
-            if( std::uncaught_exception() )
+            if( HasUncaughtException() )
                 getResultCapture().sectionEndedEarly( endInfo );
             else
                 getResultCapture().sectionEnded( endInfo );