Fix new redundant_else hits from main

Sites that only `panic!` in the `if` branch become `assert!`, since
dropping the `else` there would trip `manual_assert` instead.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

Author: emilk

benchmarks/src/cancellation.rs

@@ -220,12 +220,12 @@ async fn find_or_generate_files(
         println!("Done generating files");
         let files_on_disk = find_files_on_disk(data_dir)?;
 
-        if files_on_disk.is_empty() {
-            panic!("Tried to generate data files but there are still no files on disk");
-        } else {
-            println!("Using {} files now on disk", files_on_disk.len());
-            Ok(files_on_disk)
-        }
+        assert!(
+            !files_on_disk.is_empty(),
+            "Tried to generate data files but there are still no files on disk"
+        );
+        println!("Using {} files now on disk", files_on_disk.len());
+        Ok(files_on_disk)
     } else {
         println!("Using {} files found on disk", files_on_disk.len());
         Ok(files_on_disk)

datafusion/common-runtime/src/common.rs

@@ -89,10 +89,9 @@ impl<R: 'static> SpawnedTask<R> {
             // `JoinError` can be caused either by panic or cancellation. We have to handle panics:
             if e.is_panic() {
                 std::panic::resume_unwind(e.into_panic());
-            } else {
-                log::warn!("SpawnedTask was polled during shutdown");
-                e
             }
+            log::warn!("SpawnedTask was polled during shutdown");
+            e
         })
     }
 }

datafusion/core/tests/fuzz_cases/topk_filter_pushdown.rs

@@ -391,9 +391,6 @@ async fn test_fuzz_topk_filter_pushdown() {
         println!("\n\n");
     }
 
-    if !failures.is_empty() {
-        panic!("Some test cases failed");
-    } else {
-        println!("All test cases passed");
-    }
+    assert!(failures.is_empty(), "Some test cases failed");
+    println!("All test cases passed");
 }

datafusion/core/tests/memory_limit/mod.rs

@@ -1371,14 +1371,12 @@ impl TestCase {
                 );
             }
             Err(e) => {
-                if expected_success {
-                    panic!(
-                        "Unexpected failure when running, expected success but got: {e}"
-                    )
-                } else {
-                    for error_substring in expected_errors {
-                        assert_contains!(e.to_string(), error_substring);
-                    }
+                assert!(
+                    !expected_success,
+                    "Unexpected failure when running, expected success but got: {e}"
+                );
+                for error_substring in expected_errors {
+                    assert_contains!(e.to_string(), error_substring);
                 }
             }
         }

datafusion/datasource-arrow/src/file_format.rs

@@ -326,9 +326,8 @@ impl FileSink for ArrowFileSink {
                 Err(e) => {
                     if e.is_panic() {
                         std::panic::resume_unwind(e.into_panic());
-                    } else {
-                        unreachable!();
                     }
+                    unreachable!();
                 }
             }
         }

datafusion/datasource-avro/src/file_format.rs

@@ -291,9 +291,8 @@ impl FileSink for AvroFileSink {
                 Err(e) => {
                     if e.is_panic() {
                         std::panic::resume_unwind(e.into_panic());
-                    } else {
-                        unreachable!();
                     }
+                    unreachable!();
                 }
             }
         }

datafusion/datasource-csv/src/source.rs

@@ -546,9 +546,8 @@ pub async fn plan_to_csv(
             Err(e) => {
                 if e.is_panic() {
                     std::panic::resume_unwind(e.into_panic());
-                } else {
-                    unreachable!();
                 }
+                unreachable!();
             }
         }
     }

datafusion/datasource-json/src/source.rs

@@ -601,9 +601,8 @@ pub async fn plan_to_json(
             Err(e) => {
                 if e.is_panic() {
                     std::panic::resume_unwind(e.into_panic());
-                } else {
-                    unreachable!();
                 }
+                unreachable!();
             }
         }
     }

datafusion/datasource-parquet/src/sink.rs

@@ -388,9 +388,8 @@ impl FileSink for ParquetSink {
                 Err(e) => {
                     if e.is_panic() {
                         std::panic::resume_unwind(e.into_panic());
-                    } else {
-                        unreachable!();
                     }
+                    unreachable!();
                 }
             }
         }

datafusion/datasource-parquet/src/writer.rs

@@ -77,9 +77,8 @@ pub async fn plan_to_parquet(
             Err(e) => {
                 if e.is_panic() {
                     std::panic::resume_unwind(e.into_panic());
-                } else {
-                    unreachable!();
                 }
+                unreachable!();
             }
         }
     }