Merge pull request #1039 from dotnet/dev/bartde/ide_warnings

Oren Novotny · web-flow · commit 6bcb54f8b063 · 2019-09-24T08:21:09.000-04:00
Address a few minor IDE warnings
diff --git a/Ix.NET/Source/Benchmarks.System.Interactive/Program.cs b/Ix.NET/Source/Benchmarks.System.Interactive/Program.cs
@@ -10,7 +10,7 @@ namespace Benchmarks.System.Interactive
 {
     internal class Program
     {
-        internal static void Main(string[] args)
+        internal static void Main()
         {
             Console.WriteLine("Effective Ix-version: " + typeof(EnumerableEx).Assembly.GetName().Version);
 
diff --git a/Ix.NET/Source/System.Interactive.Async.Providers.Tests/AssertEx.cs b/Ix.NET/Source/System.Interactive.Async.Providers.Tests/AssertEx.cs
@@ -36,7 +36,7 @@ internal static void SucceedOrFailProper(Action action)
             }
             catch (AggregateException ex)
             {
-                var inner = ex.Flatten().InnerException;
+                _ = ex.Flatten().InnerException;
 
                 // TODO: proper assert; unfortunately there's not always a good call stack
             }
diff --git a/Ix.NET/Source/System.Interactive.Async.Tests/System/Linq/Operators/Never.cs b/Ix.NET/Source/System.Interactive.Async.Tests/System/Linq/Operators/Never.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information. 
 
-using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -25,7 +24,7 @@ public async Task Never1()
         [Fact]
         public async Task CancelToken_UnblocksAsync()
         {
-            var cts = new CancellationTokenSource();
+            using var cts = new CancellationTokenSource();
 
             var en = AsyncEnumerableEx.Never<int>().GetAsyncEnumerator(cts.Token);
 
diff --git a/Ix.NET/Source/System.Interactive.Tests/AssertEx.cs b/Ix.NET/Source/System.Interactive.Tests/AssertEx.cs
@@ -42,7 +42,7 @@ internal static void SucceedOrFailProper(Action action)
             }
             catch (AggregateException ex)
             {
-                var inner = ex.Flatten().InnerException;
+                _ = ex.Flatten().InnerException;
 
                 // TODO: proper assert; unfortunately there's not always a good call stack
             }
diff --git a/Ix.NET/Source/System.Interactive.Tests/System/Linq/Operators/Publish.cs b/Ix.NET/Source/System.Interactive.Tests/System/Linq/Operators/Publish.cs
@@ -162,7 +162,7 @@ public void Publish6()
             AssertThrows<MyException>(() => e2.MoveNext());
         }
 
-        class MyException : Exception
+        private class MyException : Exception
         {
         }
 
diff --git a/Ix.NET/Source/System.Interactive/System/Linq/Operators/IgnoreElements.cs b/Ix.NET/Source/System.Interactive/System/Linq/Operators/IgnoreElements.cs
@@ -24,7 +24,7 @@ public static IEnumerable<TSource> IgnoreElements<TSource>(this IEnumerable<TSou
 
         private static IEnumerable<TSource> IgnoreElementsCore<TSource>(IEnumerable<TSource> source)
         {
-            foreach (var item in source)
+            foreach (var _ in source)
                 ;
 
             yield break;
diff --git a/Ix.NET/Source/System.Linq.Async.Queryable.Tests/AssertEx.cs b/Ix.NET/Source/System.Linq.Async.Queryable.Tests/AssertEx.cs
@@ -36,7 +36,7 @@ internal static void SucceedOrFailProper(Action action)
             }
             catch (AggregateException ex)
             {
-                var inner = ex.Flatten().InnerException;
+                _ = ex.Flatten().InnerException;
 
                 // TODO: proper assert; unfortunately there's not always a good call stack
             }
diff --git a/Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/ToAsyncEnumerable.cs b/Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/ToAsyncEnumerable.cs
@@ -286,7 +286,7 @@ public async Task ToAsyncEnumerable_Observable_Throw()
         [Fact]
         public async Task ToAsyncEnumerable_Observable_Dispose()
         {
-            var stop = new ManualResetEvent(false);
+            using var stop = new ManualResetEvent(false);
 
             var xs = new MyObservable<int>(obs =>
             {
@@ -320,9 +320,9 @@ public async Task ToAsyncEnumerable_Observable_Dispose()
         [Fact]
         public async Task ToAsyncEnumerable_Observable_Zip()
         {
-            var subCount = 0;
+            using var stop = new ManualResetEvent(false);
 
-            var stop = new ManualResetEvent(false);
+            var subCount = 0;
 
             var xs = new MyObservable<int>(obs =>
             {
@@ -360,7 +360,7 @@ public async Task ToAsyncEnumerable_Observable_Zip()
         [Fact]
         public async Task ToAsyncEnumerable_Observable_Cancel()
         {
-            var stop = new ManualResetEvent(false);
+            using var stop = new ManualResetEvent(false);
 
             var xs = new MyObservable<int>(obs =>
             {
@@ -380,7 +380,7 @@ public async Task ToAsyncEnumerable_Observable_Cancel()
                 return new MyDisposable(cts.Cancel);
             }).ToAsyncEnumerable();
 
-            var c = new CancellationTokenSource();
+            using var c = new CancellationTokenSource();
 
             var e = xs.GetAsyncEnumerator(c.Token);
 
@@ -396,7 +396,7 @@ public async Task ToAsyncEnumerable_Observable_Cancel()
         [Fact]
         public async Task ToAsyncEnumerable_Observable6_Async()
         {
-            var stop = new ManualResetEvent(false);
+            using var stop = new ManualResetEvent(false);
 
             var xs = new MyObservable<int>(obs =>
             {
diff --git a/Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/ToObservable.cs b/Ix.NET/Source/System.Linq.Async.Tests/System/Linq/Operators/ToObservable.cs
@@ -22,8 +22,9 @@ public void ToObservable_Null()
         [Fact]
         public void ToObservable1()
         {
+            using var evt = new ManualResetEvent(false);
+
             var fail = false;
-            var evt = new ManualResetEvent(false);
 
             var xs = AsyncEnumerable.Empty<int>().ToObservable();
             xs.Subscribe(new MyObserver<int>(
@@ -49,9 +50,10 @@ public void ToObservable1()
         [Fact]
         public void ToObservable2()
         {
+            using var evt = new ManualResetEvent(false);
+
             var lst = new List<int>();
             var fail = false;
-            var evt = new ManualResetEvent(false);
 
             var xs = Return42.ToObservable();
             xs.Subscribe(new MyObserver<int>(
@@ -78,9 +80,10 @@ public void ToObservable2()
         [Fact]
         public void ToObservable3()
         {
+            using var evt = new ManualResetEvent(false);
+
             var lst = new List<int>();
             var fail = false;
-            var evt = new ManualResetEvent(false);
 
             var xs = AsyncEnumerable.Range(0, 10).ToObservable();
             xs.Subscribe(new MyObserver<int>(
@@ -107,10 +110,11 @@ public void ToObservable3()
         [Fact]
         public void ToObservable4()
         {
+            using var evt = new ManualResetEvent(false);
+
             var ex1 = new Exception("Bang!");
             var ex_ = default(Exception);
             var fail = false;
-            var evt = new ManualResetEvent(false);
 
             var xs = Throw<int>(ex1).ToObservable();
             xs.Subscribe(new MyObserver<int>(
@@ -138,8 +142,9 @@ public void ToObservable4()
         [Fact]
         public void ToObservable_DisposesEnumeratorOnCompletion()
         {
+            using var evt = new ManualResetEvent(false);
+
             var fail = false;
-            var evt = new ManualResetEvent(false);
 
             var ae = AsyncEnumerable.Create(
                 _ => AsyncEnumerator.Create<int>(
@@ -170,8 +175,9 @@ public void ToObservable_DisposesEnumeratorOnCompletion()
         [Fact]
         public void ToObservable_DisposesEnumeratorWhenSubscriptionIsDisposed()
         {
+            using var evt = new ManualResetEvent(false);
+
             var fail = false;
-            var evt = new ManualResetEvent(false);
             var subscription = default(IDisposable);
             var subscriptionAssignedTcs = new TaskCompletionSource<object>();
 
@@ -216,9 +222,10 @@ public void ToObservable_DisposesEnumeratorWhenSubscriptionIsDisposed()
         [Fact]
         public void ToObservable_DesNotCallMoveNextAgainWhenSubscriptionIsDisposed()
         {
+            using var evt = new ManualResetEvent(false);
+
             var fail = false;
             var moveNextCount = 0;
-            var evt = new ManualResetEvent(false);
             var subscription = default(IDisposable);
             var subscriptionAssignedTcs = new TaskCompletionSource<object>();
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Benchmarks.System.Interactive`
`10`	`10`	`{`
`11`	`11`	`internal class Program`
`12`	`12`	`{`
`13`		`- internal static void Main(string[] args)`
	`13`	`+ internal static void Main()`
`14`	`14`	`{`
`15`	`15`	`Console.WriteLine("Effective Ix-version: " + typeof(EnumerableEx).Assembly.GetName().Version);`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ internal static void SucceedOrFailProper(Action action)`
`36`	`36`	`}`
`37`	`37`	`catch (AggregateException ex)`
`38`	`38`	`{`
`39`		`- var inner = ex.Flatten().InnerException;`
	`39`	`+ _ = ex.Flatten().InnerException;`
`40`	`40`
`41`	`41`	`// TODO: proper assert; unfortunately there's not always a good call stack`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ internal static void SucceedOrFailProper(Action action)`
`42`	`42`	`}`
`43`	`43`	`catch (AggregateException ex)`
`44`	`44`	`{`
`45`		`- var inner = ex.Flatten().InnerException;`
	`45`	`+ _ = ex.Flatten().InnerException;`
`46`	`46`
`47`	`47`	`// TODO: proper assert; unfortunately there's not always a good call stack`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public void Publish6()`
`162`	`162`	`AssertThrows<MyException>(() => e2.MoveNext());`
`163`	`163`	`}`
`164`	`164`
`165`		`- class MyException : Exception`
	`165`	`+ private class MyException : Exception`
`166`	`166`	`{`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static IEnumerable<TSource> IgnoreElements<TSource>(this IEnumerable<TSou`
`24`	`24`
`25`	`25`	`private static IEnumerable<TSource> IgnoreElementsCore<TSource>(IEnumerable<TSource> source)`
`26`	`26`	`{`
`27`		`- foreach (var item in source)`
	`27`	`+ foreach (var _ in source)`
`28`	`28`	`;`
`29`	`29`
`30`	`30`	`yield break;`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public async Task ToAsyncEnumerable_Observable_Throw()`
`286`	`286`	`[Fact]`
`287`	`287`	`public async Task ToAsyncEnumerable_Observable_Dispose()`
`288`	`288`	`{`
`289`		`- var stop = new ManualResetEvent(false);`
	`289`	`+ using var stop = new ManualResetEvent(false);`
`290`	`290`
`291`	`291`	`var xs = new MyObservable<int>(obs =>`
`292`	`292`	`{`
`@@ -320,9 +320,9 @@ public async Task ToAsyncEnumerable_Observable_Dispose()`
`320`	`320`	`[Fact]`
`321`	`321`	`public async Task ToAsyncEnumerable_Observable_Zip()`
`322`	`322`	`{`
`323`		`- var subCount = 0;`
	`323`	`+ using var stop = new ManualResetEvent(false);`
`324`	`324`
`325`		`- var stop = new ManualResetEvent(false);`
	`325`	`+ var subCount = 0;`
`326`	`326`
`327`	`327`	`var xs = new MyObservable<int>(obs =>`
`328`	`328`	`{`
`@@ -360,7 +360,7 @@ public async Task ToAsyncEnumerable_Observable_Zip()`
`360`	`360`	`[Fact]`
`361`	`361`	`public async Task ToAsyncEnumerable_Observable_Cancel()`
`362`	`362`	`{`
`363`		`- var stop = new ManualResetEvent(false);`
	`363`	`+ using var stop = new ManualResetEvent(false);`
`364`	`364`
`365`	`365`	`var xs = new MyObservable<int>(obs =>`
`366`	`366`	`{`
`@@ -380,7 +380,7 @@ public async Task ToAsyncEnumerable_Observable_Cancel()`
`380`	`380`	`return new MyDisposable(cts.Cancel);`
`381`	`381`	`}).ToAsyncEnumerable();`
`382`	`382`
`383`		`- var c = new CancellationTokenSource();`
	`383`	`+ using var c = new CancellationTokenSource();`
`384`	`384`
`385`	`385`	`var e = xs.GetAsyncEnumerator(c.Token);`
`386`	`386`
`@@ -396,7 +396,7 @@ public async Task ToAsyncEnumerable_Observable_Cancel()`
`396`	`396`	`[Fact]`
`397`	`397`	`public async Task ToAsyncEnumerable_Observable6_Async()`
`398`	`398`	`{`
`399`		`- var stop = new ManualResetEvent(false);`
	`399`	`+ using var stop = new ManualResetEvent(false);`
`400`	`400`
`401`	`401`	`var xs = new MyObservable<int>(obs =>`
`402`	`402`	`{`