From 81c14a61ba5a9ff0c139251735f4ee33b73ba16d Mon Sep 17 00:00:00 2001
From: windowsair <dev@airkyi.com>
Date: Thu, 18 Jun 2026 20:48:56 +0800
Subject: [PATCH] Remove try/catch block on unique_resource move constructor

The clang-21 says:

include/nonstd/scope.hpp:1007:40: error:
      cannot refer to a non-static member from the handler of a constructor function try block
      [-Werror,-Wexceptions]
 1007 |             other.get_deleter()( this->get() );
      |                                        ^
1 error generated.

Since the move constructor already provides an noexcept guarantee,
no exceptions will be thrown here. The try-catch block is redundant.

And a further approach is to provide a throwable exception variant of
the move constructor.
---
 include/nonstd/scope.hpp | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/include/nonstd/scope.hpp b/include/nonstd/scope.hpp
index 03a98ef..69f4c9b 100644
--- a/include/nonstd/scope.hpp
+++ b/include/nonstd/scope.hpp
@@ -980,34 +980,15 @@ class unique_resource
     // The stored resource handle is initialized from the one of other, using std::move if
     // std::is_nothrow_move_constructible_v<RS> is true.
     //
-    // If initialization of the stored resource handle throws an exception, other is not modified.
-    //
-    // Then, the deleter is initialized with the one of other, using std::move if
-    // std::is_nothrow_move_constructible_v<D> is true.
-    //
-    // If initialization of the deleter throws an exception and std::is_nothrow_move_constructible_v<RS> is true and
-    // other owns the resource, calls the deleter of other with res_ to dispose the resource, then calls other.release().
-    //
-    // After construction, the constructed unique_resource owns its resource if and only if other owned the resource before
-    // the construction, and other is set to not own the resource.
 
     unique_resource( unique_resource && other )
         scope_noexcept_op(
             std11::is_nothrow_move_constructible<R1>::value && std11::is_nothrow_move_constructible<D>::value
         )
-    try
         : resource( conditional_move( std::move(other.resource), typename std11::bool_constant< std11::is_nothrow_move_assignable<R>::value >() ) )
         , deleter(  conditional_move( std::move(other.deleter ), typename std11::bool_constant< std11::is_nothrow_move_constructible<D>::value >() ) )
         , execute_on_reset( std14::exchange( other.execute_on_reset, false ) )
     {}
-    catch(...)
-    {
-        if ( other.execute_on_reset && std11::is_nothrow_move_constructible<R>::value )
-        {
-            other.get_deleter()( this->get() );
-            other.release();
-        }
-    }
 
     ~unique_resource()
     {