address avoid_oritinate comment, no need for a different name, resuse existing hresult_cancelled

Author: antmor

strings/base_coroutine_foundation.h

@@ -490,7 +490,7 @@ namespace winrt::impl
                     m_status.store(AsyncStatus::Canceled, std::memory_order_relaxed);
                     if (cancellable_promise::avoid_cancel_origination_enabled())
                     {
-                        m_exception = std::make_exception_ptr(non_originating_hresult_canceled());
+                        m_exception = std::make_exception_ptr(hresult_canceled(hresult_error::avoid_originate));
                     }
                     else
                     {
@@ -628,10 +628,6 @@ namespace winrt::impl
             {
                 m_status.store(AsyncStatus::Canceled, std::memory_order_relaxed);
             }
-            catch (non_originating_hresult_canceled const&)
-            {
-                m_status.store(AsyncStatus::Canceled, std::memory_order_relaxed);
-            }
             catch (...)
             {
                 m_status.store(AsyncStatus::Error, std::memory_order_relaxed);
@@ -645,7 +641,7 @@ namespace winrt::impl
             {
                 if (cancellable_promise::avoid_cancel_origination_enabled())
                 {
-                    throw winrt::non_originating_hresult_canceled();
+                    throw winrt::hresult_canceled(hresult_error::avoid_originate);
                 }
                 else
                 {

strings/base_error.h

@@ -332,17 +332,11 @@ WINRT_EXPORT namespace winrt
     struct hresult_canceled : hresult_error
     {
         hresult_canceled(winrt::impl::slim_source_location const& sourceInformation = winrt::impl::slim_source_location::current()) noexcept : hresult_error(impl::error_canceled, sourceInformation) {}
+        hresult_canceled(hresult_error::avoid_originate_t) noexcept : hresult_error(impl::error_canceled, hresult_error::avoid_originate) {}
         hresult_canceled(param::hstring const& message, winrt::impl::slim_source_location const& sourceInformation = winrt::impl::slim_source_location::current()) noexcept : hresult_error(impl::error_canceled, message, sourceInformation) {}
         hresult_canceled(take_ownership_from_abi_t, winrt::impl::slim_source_location const& sourceInformation = winrt::impl::slim_source_location::current()) noexcept : hresult_error(impl::error_canceled, take_ownership_from_abi, sourceInformation) {}
     };
 
-    struct non_originating_hresult_canceled : hresult_error
-    {
-        non_originating_hresult_canceled(winrt::impl::slim_source_location const& sourceInformation = winrt::impl::slim_source_location::current()) noexcept : hresult_error(impl::error_canceled, hresult_error::avoid_originate, sourceInformation) {}
-        non_originating_hresult_canceled(param::hstring const& message, winrt::impl::slim_source_location const& sourceInformation = winrt::impl::slim_source_location::current()) = delete;
-        non_originating_hresult_canceled(take_ownership_from_abi_t , winrt::impl::slim_source_location const& sourceInformation = winrt::impl::slim_source_location::current()) = delete;
-    };
-
     [[noreturn]] inline WINRT_IMPL_NOINLINE void throw_hresult(hresult const result, winrt::impl::slim_source_location const& sourceInformation = winrt::impl::slim_source_location::current())
     {
         if (winrt_throw_hresult_handler)

test/old_tests/UnitTests/TryLookup.cpp

@@ -187,6 +187,4 @@ TEST_CASE("trylookup_from_abi specialization")
     REQUIRE_THROWS_AS(map.TryLookup(123), hresult_wrong_thread);
     // regular lookup should throw the same error
     REQUIRE_THROWS_AS(map.Lookup(123), hresult_wrong_thread);
-
-
 }