Rebase on the latest original main

Author: Jan Diederich

src/docker/local.rs

@@ -166,7 +166,7 @@ pub(crate) fn run(
     // simpler: just test if the program termination handler was called.
     // SAFETY: an atomic load.
     #[allow(static_mut_refs)]
-    let is_terminated = unsafe { crate::errors::TERMINATED.load(Ordering::SeqCst) };
+    let is_terminated = crate::errors::TERMINATED.load(Ordering::SeqCst);
     if !is_terminated {
         ChildContainer::exit_static();
     }

src/docker/shared.rs

@@ -4,8 +4,6 @@ use super::custom::{Dockerfile, PreBuild};
 use super::image::PossibleImage;
 use super::Image;
 use super::PROVIDED_IMAGES;
-use super::custom::{Dockerfile, PreBuild};
-use super::image::PossibleImage;
 use super::{ProvidedImage, engine::*};
 use crate::cargo::CargoMetadata;
 use crate::config::Config;

src/errors.rs

@@ -19,7 +19,7 @@ pub fn install_panic_hook() -> Result<()> {
 
 /// # Safety
 /// Safe as long as we have single-threaded execution.
-unsafe fn termination_handler() {
+fn termination_handler() {
     // we can't warn the user here, since locks aren't signal-safe.
     // we can delete files, since fdopendir is thread-safe, and
     // `openat`, `unlinkat`, and `lstat` are signal-safe.
@@ -106,7 +106,7 @@ unsafe fn termination_handler() {
     // a global CString and `Vec<CString>`, respectively. this atomic guard
     // makes this safe regardless.
     #[allow(static_mut_refs)] // FIXME: Use correct types for CHILD_CONTAINER
-    docker::CHILD_CONTAINER.terminate();
+    unsafe { docker::CHILD_CONTAINER.terminate(); }
 
     // all termination exit codes are 128 + signal code. the exit code is
     // 130 for Ctrl+C or SIGINT (signal code 2) for linux, macos, and windows.