Clean up `AutoRemoveJail`, `AutoDelete`, and `AutoUnmount` by Ericson2314 · Pull Request #15079 · NixOS/nix

Ericson2314 · 2026-01-24T23:50:56Z

Motivation

Extract destructor logic into named methods (deletePath(), unmount(), and remove()) that can be called explicitly. These ones will throw exceptions normally, unlike the destructor which must quash them to avoid double-exceptions.
Use std::filesystem::path in AutoUnmount (changed from Path)
Remove del field from AutoRemoveJail, using INVALID_JAIL sentinel value instead.
Add move assignment operators implemented via friend swap functions for all three RAII classes.
Remove old reset(...) methods that took parameters. These were a bit misleading --- do they cancel or immediately destroy? --- and doing it explicitly with cancel and then assignment is not hard.

Context

Needed for some sandboxing cleanups.

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

src/libutil/file-system.cc

src/libutil/include/nix/util/file-system.hh

src/libutil/freebsd/include/nix/util/freebsd-jail.hh

src/libutil/include/nix/util/file-system.hh

src/libutil/freebsd/include/nix/util/freebsd-jail.hh

- Extract destructor logic into named methods (`deletePath()`, `unmount()`, and `remove()`) that can be called explicitly. These ones will throw exceptions normally, unlike the destructor which must quash them to avoid double-exceptions. - Use `std::filesystem::path` in `AutoUnmount` (changed from `Path`) - Remove `del` field from `AutoRemoveJail`, using `INVALID_JAIL` sentinel value instead. - Add move assignment operators implemented via friend `swap` functions for all three RAII classes. - Remove old `reset(...)` methods that took parameters. These were a bit misleading --- do they cancel or immediately destroy? --- and doing it explicitly with cancel and then assignment is not hard. Co-authored-by: Sergei Zimmerman <sergei@zimmerman.foo>

Ericson2314 requested a review from edolstra as a code owner January 24, 2026 23:50

github-actions bot added the fetching Networking with the outside (non-Nix) world, input locking label Jan 24, 2026

Ericson2314 force-pushed the auto-cleanup-cleanups branch 2 times, most recently from 0e6dce9 to ad5a1e1 Compare January 24, 2026 23:53