Merge pull request #1391 from dotnet/dev/bartde/simpler_exception_rethrow

Ensure all exception rethrows use EDI.

Author: bartdesmet

Rx.NET/Source/src/System.Reactive/Internal/ExceptionServices.cs

@@ -15,14 +15,6 @@ internal static class ExceptionHelpers
         [DoesNotReturn]
         public static void Throw(this Exception exception) => Services.Value.Rethrow(exception);
 
-        public static void ThrowIfNotNull(this Exception? exception)
-        {
-            if (exception != null)
-            {
-                Services.Value.Rethrow(exception);
-            }
-        }
-
         private static IExceptionServices Initialize()
         {
 #pragma warning disable CS0618 // Type or member is obsolete

Rx.NET/Source/src/System.Reactive/Internal/PushPullAdapter.cs

@@ -67,7 +67,7 @@ public bool MoveNext()
                 done = current.Kind != NotificationKind.OnNext;
             }
 
-            current.Exception.ThrowIfNotNull();
+            current.Exception?.Throw();
 
             return current.HasValue;
         }

Rx.NET/Source/src/System.Reactive/Linq/Observable/GetEnumerator.cs

@@ -70,7 +70,7 @@ public bool MoveNext()
                 return true;
             }
 
-            _error.ThrowIfNotNull();
+            _error?.Throw();
 
             Debug.Assert(_done);
 

Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Blocking.cs

@@ -78,7 +78,7 @@ private static TSource FirstOrDefaultInternal<TSource>(IObservable<TSource> sour
                 consumer.Wait();
             }
 
-            consumer._error.ThrowIfNotNull();
+            consumer._error?.Throw();
 
             if (throwOnEmpty && !consumer._hasValue)
             {
@@ -101,7 +101,7 @@ public virtual void ForEach<TSource>(IObservable<TSource> source, Action<TSource
                 sink.Wait();
             }
 
-            sink.Error.ThrowIfNotNull();
+            sink.Error?.Throw();
         }
 
         public virtual void ForEach<TSource>(IObservable<TSource> source, Action<TSource, int> onNext)
@@ -113,7 +113,7 @@ public virtual void ForEach<TSource>(IObservable<TSource> source, Action<TSource
                 sink.Wait();
             }
 
-            sink.Error.ThrowIfNotNull();
+            sink.Error?.Throw();
         }
 
         #endregion
@@ -166,7 +166,7 @@ private static TSource LastOrDefaultInternal<TSource>(IObservable<TSource> sourc
                 consumer.Wait();
             }
 
-            consumer._error.ThrowIfNotNull();
+            consumer._error?.Throw();
 
             if (throwOnEmpty && !consumer._hasValue)
             {
@@ -243,7 +243,7 @@ private static TSource SingleOrDefaultInternal<TSource>(IObservable<TSource> sou
                 consumer.Wait();
             }
 
-            consumer._error.ThrowIfNotNull();
+            consumer._error?.Throw();
 
             if (consumer._hasMoreThanOneElement)
             {

Rx.NET/Source/src/System.Reactive/Runtime/CompilerServices/TaskObservableMethodBuilder.cs

@@ -328,7 +328,7 @@ public T GetResult()
                     return _subject.GetResult();
                 }
 
-                _exception.ThrowIfNotNull();
+                _exception?.Throw();
 
                 return _result!;
             }

Rx.NET/Source/src/System.Reactive/Subjects/AsyncSubject.cs

@@ -427,7 +427,7 @@ public T GetResult()
                 e.Wait();
             }
 
-            _exception.ThrowIfNotNull();
+            _exception?.Throw();
 
             if (!_hasValue)
             {

Rx.NET/Source/src/System.Reactive/Subjects/BehaviorSubject.cs

@@ -84,10 +84,7 @@ public T Value
                 {
                     CheckDisposed();
 
-                    if (_exception != null)
-                    {
-                        throw _exception;
-                    }
+                    _exception?.Throw();
 
                     return _value;
                 }
@@ -121,10 +118,7 @@ public bool TryGetValue([MaybeNullWhen(false)] out T value)
                     return false;
                 }
 
-                if (_exception != null)
-                {
-                    throw _exception;
-                }
+                _exception?.Throw();
 
                 value = _value;
                 return true;