Merge pull request #712 from akarnokd/SimplifyDefaultExpr

danielcweber · web-flow · commit 0d41a8876c0e · 2018-06-29T13:04:11.000+02:00
4.x: simplify default(X) usages
diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Aggregate.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Aggregate.cs
@@ -29,8 +29,6 @@ public _(Func<TSource, TSource, TSource> accumulator, IObserver<TSource> observe
                 : base(observer)
             {
                 _accumulator = accumulator;
-                _accumulation = default;
-                _hasAccumulation = false;
             }
 
             public override void OnNext(TSource value)
@@ -48,11 +46,18 @@ public override void OnNext(TSource value)
                     }
                     catch (Exception exception)
                     {
+                        _accumulation = default;
                         ForwardOnError(exception);
                     }
                 }
             }
 
+            public override void OnError(Exception error)
+            {
+                _accumulation = default;
+                ForwardOnError(error);
+            }
+
             public override void OnCompleted()
             {
                 if (!_hasAccumulation)
@@ -61,7 +66,9 @@ public override void OnCompleted()
                 }
                 else
                 {
-                    ForwardOnNext(_accumulation);
+                    var accumulation = _accumulation;
+                    _accumulation = default;
+                    ForwardOnNext(accumulation);
                     ForwardOnCompleted();
                 }
             }
@@ -105,18 +112,22 @@ public override void OnNext(TSource value)
                 }
                 catch (Exception exception)
                 {
+                    _accumulation = default;
                     ForwardOnError(exception);
                 }
             }
 
             public override void OnError(Exception error)
             {
+                _accumulation = default;
                 ForwardOnError(error);
             }
 
             public override void OnCompleted()
             {
-                ForwardOnNext(_accumulation);
+                var accumulation = _accumulation;
+                _accumulation = default;
+                ForwardOnNext(accumulation);
                 ForwardOnCompleted();
             }
         }
diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/LastAsync.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/LastAsync.cs
@@ -27,8 +27,7 @@ internal sealed class _ : IdentitySink<TSource>
                 public _(IObserver<TSource> observer)
                     : base(observer)
                 {
-                    _value = default;
-                    _seenValue = false;
+
                 }
 
                 public override void OnNext(TSource value)
@@ -37,6 +36,12 @@ public override void OnNext(TSource value)
                     _seenValue = true;
                 }
 
+                public override void OnError(Exception error)
+                {
+                    _value = default;
+                    ForwardOnError(error);
+                }
+
                 public override void OnCompleted()
                 {
                     if (!_seenValue)
@@ -45,7 +50,9 @@ public override void OnCompleted()
                     }
                     else
                     {
-                        ForwardOnNext(_value);
+                        var value = _value;
+                        _value = default;
+                        ForwardOnNext(value);
                         ForwardOnCompleted();
                     }
                 }
@@ -77,9 +84,6 @@ public _(Func<TSource, bool> predicate, IObserver<TSource> observer)
                     : base(observer)
                 {
                     _predicate = predicate;
-
-                    _value = default;
-                    _seenValue = false;
                 }
 
                 public override void OnNext(TSource value)
@@ -92,6 +96,7 @@ public override void OnNext(TSource value)
                     }
                     catch (Exception ex)
                     {
+                        _value = default;
                         ForwardOnError(ex);
                         return;
                     }
@@ -103,6 +108,12 @@ public override void OnNext(TSource value)
                     }
                 }
 
+                public override void OnError(Exception error)
+                {
+                    _value = default;
+                    ForwardOnError(error);
+                }
+
                 public override void OnCompleted()
                 {
                     if (!_seenValue)
@@ -111,7 +122,9 @@ public override void OnCompleted()
                     }
                     else
                     {
-                        ForwardOnNext(_value);
+                        var value = _value;
+                        _value = default;
+                        ForwardOnNext(value);
                         ForwardOnCompleted();
                     }
                 }
diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/LastOrDefaultAsync.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/LastOrDefaultAsync.cs
@@ -26,17 +26,25 @@ internal sealed class _ : IdentitySink<TSource>
                 public _(IObserver<TSource> observer)
                     : base(observer)
                 {
-                    _value = default;
+
                 }
 
                 public override void OnNext(TSource value)
                 {
                     _value = value;
                 }
 
+                public override void OnError(Exception error)
+                {
+                    _value = default;
+                    ForwardOnError(error);
+                }
+
                 public override void OnCompleted()
                 {
-                    ForwardOnNext(_value);
+                    var value = _value;
+                    _value = default;
+                    ForwardOnNext(value);
                     ForwardOnCompleted();
                 }
             }
@@ -66,8 +74,6 @@ public _(Func<TSource, bool> predicate, IObserver<TSource> observer)
                     : base(observer)
                 {
                     _predicate = predicate;
-
-                    _value = default;
                 }
 
                 public override void OnNext(TSource value)
@@ -80,6 +86,7 @@ public override void OnNext(TSource value)
                     }
                     catch (Exception ex)
                     {
+                        _value = default;
                         ForwardOnError(ex);
                         return;
                     }
@@ -90,9 +97,17 @@ public override void OnNext(TSource value)
                     }
                 }
 
+                public override void OnError(Exception error)
+                {
+                    _value = default;
+                    ForwardOnError(error);
+                }
+
                 public override void OnCompleted()
                 {
-                    ForwardOnNext(_value);
+                    var value = _value;
+                    _value = default;
+                    ForwardOnNext(value);
                     ForwardOnCompleted();
                 }
             }
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingTest.cs b/Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/UsingTest.cs
@@ -46,7 +46,7 @@ public void Using_Null()
                         _d = d;
                         createInvoked++;
                         xs = scheduler.CreateColdObservable(
-                            OnNext<long>(100, scheduler.Clock),
+                            OnNext(100, scheduler.Clock),
                             OnCompleted<long>(200));
                         return xs;
                     }

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ public _(Func<TSource, TSource, TSource> accumulator, IObserver<TSource> observe`
`29`	`29`	`: base(observer)`
`30`	`30`	`{`
`31`	`31`	`_accumulator = accumulator;`
`32`		`- _accumulation = default;`
`33`		`- _hasAccumulation = false;`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	`public override void OnNext(TSource value)`
`@@ -48,11 +46,18 @@ public override void OnNext(TSource value)`
`48`	`46`	`}`
`49`	`47`	`catch (Exception exception)`
`50`	`48`	`{`
	`49`	`+ _accumulation = default;`
`51`	`50`	`ForwardOnError(exception);`
`52`	`51`	`}`
`53`	`52`	`}`
`54`	`53`	`}`
`55`	`54`
	`55`	`+ public override void OnError(Exception error)`
	`56`	`+ {`
	`57`	`+ _accumulation = default;`
	`58`	`+ ForwardOnError(error);`
	`59`	`+ }`
	`60`	`+`
`56`	`61`	`public override void OnCompleted()`
`57`	`62`	`{`
`58`	`63`	`if (!_hasAccumulation)`
`@@ -61,7 +66,9 @@ public override void OnCompleted()`
`61`	`66`	`}`
`62`	`67`	`else`
`63`	`68`	`{`
`64`		`- ForwardOnNext(_accumulation);`
	`69`	`+ var accumulation = _accumulation;`
	`70`	`+ _accumulation = default;`
	`71`	`+ ForwardOnNext(accumulation);`
`65`	`72`	`ForwardOnCompleted();`
`66`	`73`	`}`
`67`	`74`	`}`
`@@ -105,18 +112,22 @@ public override void OnNext(TSource value)`
`105`	`112`	`}`
`106`	`113`	`catch (Exception exception)`
`107`	`114`	`{`
	`115`	`+ _accumulation = default;`
`108`	`116`	`ForwardOnError(exception);`
`109`	`117`	`}`
`110`	`118`	`}`
`111`	`119`
`112`	`120`	`public override void OnError(Exception error)`
`113`	`121`	`{`
	`122`	`+ _accumulation = default;`
`114`	`123`	`ForwardOnError(error);`
`115`	`124`	`}`
`116`	`125`
`117`	`126`	`public override void OnCompleted()`
`118`	`127`	`{`
`119`		`- ForwardOnNext(_accumulation);`
	`128`	`+ var accumulation = _accumulation;`
	`129`	`+ _accumulation = default;`
	`130`	`+ ForwardOnNext(accumulation);`
`120`	`131`	`ForwardOnCompleted();`
`121`	`132`	`}`
`122`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ internal sealed class _ : IdentitySink<TSource>`
`27`	`27`	`public _(IObserver<TSource> observer)`
`28`	`28`	`: base(observer)`
`29`	`29`	`{`
`30`		`- _value = default;`
`31`		`- _seenValue = false;`
	`30`	`+`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`public override void OnNext(TSource value)`
`@@ -37,6 +36,12 @@ public override void OnNext(TSource value)`
`37`	`36`	`_seenValue = true;`
`38`	`37`	`}`
`39`	`38`
	`39`	`+ public override void OnError(Exception error)`
	`40`	`+ {`
	`41`	`+ _value = default;`
	`42`	`+ ForwardOnError(error);`
	`43`	`+ }`
	`44`	`+`
`40`	`45`	`public override void OnCompleted()`
`41`	`46`	`{`
`42`	`47`	`if (!_seenValue)`
`@@ -45,7 +50,9 @@ public override void OnCompleted()`
`45`	`50`	`}`
`46`	`51`	`else`
`47`	`52`	`{`
`48`		`- ForwardOnNext(_value);`
	`53`	`+ var value = _value;`
	`54`	`+ _value = default;`
	`55`	`+ ForwardOnNext(value);`
`49`	`56`	`ForwardOnCompleted();`
`50`	`57`	`}`
`51`	`58`	`}`
`@@ -77,9 +84,6 @@ public _(Func<TSource, bool> predicate, IObserver<TSource> observer)`
`77`	`84`	`: base(observer)`
`78`	`85`	`{`
`79`	`86`	`_predicate = predicate;`
`80`		`-`
`81`		`- _value = default;`
`82`		`- _seenValue = false;`
`83`	`87`	`}`
`84`	`88`
`85`	`89`	`public override void OnNext(TSource value)`
`@@ -92,6 +96,7 @@ public override void OnNext(TSource value)`
`92`	`96`	`}`
`93`	`97`	`catch (Exception ex)`
`94`	`98`	`{`
	`99`	`+ _value = default;`
`95`	`100`	`ForwardOnError(ex);`
`96`	`101`	`return;`
`97`	`102`	`}`
`@@ -103,6 +108,12 @@ public override void OnNext(TSource value)`
`103`	`108`	`}`
`104`	`109`	`}`
`105`	`110`
	`111`	`+ public override void OnError(Exception error)`
	`112`	`+ {`
	`113`	`+ _value = default;`
	`114`	`+ ForwardOnError(error);`
	`115`	`+ }`
	`116`	`+`
`106`	`117`	`public override void OnCompleted()`
`107`	`118`	`{`
`108`	`119`	`if (!_seenValue)`
`@@ -111,7 +122,9 @@ public override void OnCompleted()`
`111`	`122`	`}`
`112`	`123`	`else`
`113`	`124`	`{`
`114`		`- ForwardOnNext(_value);`
	`125`	`+ var value = _value;`
	`126`	`+ _value = default;`
	`127`	`+ ForwardOnNext(value);`
`115`	`128`	`ForwardOnCompleted();`
`116`	`129`	`}`
`117`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,17 +26,25 @@ internal sealed class _ : IdentitySink<TSource>`
`26`	`26`	`public _(IObserver<TSource> observer)`
`27`	`27`	`: base(observer)`
`28`	`28`	`{`
`29`		`- _value = default;`
	`29`	`+`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public override void OnNext(TSource value)`
`33`	`33`	`{`
`34`	`34`	`_value = value;`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ public override void OnError(Exception error)`
	`38`	`+ {`
	`39`	`+ _value = default;`
	`40`	`+ ForwardOnError(error);`
	`41`	`+ }`
	`42`	`+`
`37`	`43`	`public override void OnCompleted()`
`38`	`44`	`{`
`39`		`- ForwardOnNext(_value);`
	`45`	`+ var value = _value;`
	`46`	`+ _value = default;`
	`47`	`+ ForwardOnNext(value);`
`40`	`48`	`ForwardOnCompleted();`
`41`	`49`	`}`
`42`	`50`	`}`
`@@ -66,8 +74,6 @@ public _(Func<TSource, bool> predicate, IObserver<TSource> observer)`
`66`	`74`	`: base(observer)`
`67`	`75`	`{`
`68`	`76`	`_predicate = predicate;`
`69`		`-`
`70`		`- _value = default;`
`71`	`77`	`}`
`72`	`78`
`73`	`79`	`public override void OnNext(TSource value)`
`@@ -80,6 +86,7 @@ public override void OnNext(TSource value)`
`80`	`86`	`}`
`81`	`87`	`catch (Exception ex)`
`82`	`88`	`{`
	`89`	`+ _value = default;`
`83`	`90`	`ForwardOnError(ex);`
`84`	`91`	`return;`
`85`	`92`	`}`
`@@ -90,9 +97,17 @@ public override void OnNext(TSource value)`
`90`	`97`	`}`
`91`	`98`	`}`
`92`	`99`
	`100`	`+ public override void OnError(Exception error)`
	`101`	`+ {`
	`102`	`+ _value = default;`
	`103`	`+ ForwardOnError(error);`
	`104`	`+ }`
	`105`	`+`
`93`	`106`	`public override void OnCompleted()`
`94`	`107`	`{`
`95`		`- ForwardOnNext(_value);`
	`108`	`+ var value = _value;`
	`109`	`+ _value = default;`
	`110`	`+ ForwardOnNext(value);`
`96`	`111`	`ForwardOnCompleted();`
`97`	`112`	`}`
`98`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void Using_Null()`
`46`	`46`	`_d = d;`
`47`	`47`	`createInvoked++;`
`48`	`48`	`xs = scheduler.CreateColdObservable(`
`49`		`- OnNext<long>(100, scheduler.Clock),`
	`49`	`+ OnNext(100, scheduler.Clock),`
`50`	`50`	`OnCompleted<long>(200));`
`51`	`51`	`return xs;`
`52`	`52`	`}`