Merge pull request #347 from Reactive-Extensions/MoreNameOf

Using nameof in more places
dotnet · Apr 13, 2017 · a341d21 · a341d21
2 parents 6f6be72 + 94793ea
commit a341d21
Show file tree

Hide file tree

Showing 11 changed files with 1,868 additions and 1,868 deletions.
diff --git a/Rx.NET/Source/src/Microsoft.Reactive.Testing/MockObserver.cs b/Rx.NET/Source/src/Microsoft.Reactive.Testing/MockObserver.cs
@@ -16,7 +16,7 @@ class MockObserver<T> : ITestableObserver<T>
         public MockObserver(TestScheduler scheduler)
         {
             if (scheduler == null)
-                throw new ArgumentNullException("scheduler");
+                throw new ArgumentNullException(nameof(scheduler));
 
             this.scheduler = scheduler;
             this.messages = new List<Recorded<Notification<T>>>();

diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.Windows.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.Windows.cs
@@ -34,7 +34,7 @@ public IDisposable StartPeriodicTimer(Action action, TimeSpan period)
             // for more information.
             //
             if (period < TimeSpan.FromMilliseconds(1))
-                throw new ArgumentOutOfRangeException("period", Strings_PlatformServices.WINRT_NO_SUB1MS_TIMERS);
+                throw new ArgumentOutOfRangeException(nameof(period), Strings_PlatformServices.WINRT_NO_SUB1MS_TIMERS);
 
             var res = global::Windows.System.Threading.ThreadPoolTimer.CreatePeriodicTimer(
                 tpt =>

diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/ThreadPoolScheduler.Windows.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/ThreadPoolScheduler.Windows.cs
@@ -86,7 +86,7 @@ public WorkItemOptions Options
         public override IDisposable Schedule<TState>(TState state, Func<IScheduler, TState, IDisposable> action)
         {
             if (action == null)
-                throw new ArgumentNullException("action");
+                throw new ArgumentNullException(nameof(action));
 
             var d = new SingleAssignmentDisposable();
 
@@ -114,7 +114,7 @@ public override IDisposable Schedule<TState>(TState state, Func<IScheduler, TSta
         public override IDisposable Schedule<TState>(TState state, TimeSpan dueTime, Func<IScheduler, TState, IDisposable> action)
         {
             if (action == null)
-                throw new ArgumentNullException("action");
+                throw new ArgumentNullException(nameof(action));
 
             var dt = Scheduler.Normalize(dueTime);
 
@@ -157,9 +157,9 @@ public IDisposable SchedulePeriodic<TState>(TState state, TimeSpan period, Func<
             // for more information.
             //
             if (period < TimeSpan.FromMilliseconds(1))
-                throw new ArgumentOutOfRangeException("period", Strings_PlatformServices.WINRT_NO_SUB1MS_TIMERS);
+                throw new ArgumentOutOfRangeException(nameof(period), Strings_PlatformServices.WINRT_NO_SUB1MS_TIMERS);
             if (action == null)
-                throw new ArgumentNullException("action");
+                throw new ArgumentNullException(nameof(action));
 
             var state1 = state;
             var gate = new AsyncLock();

diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable.Aggregates.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable.Aggregates.cs
diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable.Async.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable.Async.cs
diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable.Events.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable.Events.cs
@@ -48,9 +48,9 @@ public static partial class Observable
         public static IObservable<EventPattern<EventArgs>> FromEventPattern(Action<EventHandler> addHandler, Action<EventHandler> removeHandler)
         {
             if (addHandler == null)
-                throw new ArgumentNullException("addHandler");
+                throw new ArgumentNullException(nameof(addHandler));
             if (removeHandler == null)
-                throw new ArgumentNullException("removeHandler");
+                throw new ArgumentNullException(nameof(removeHandler));
 
             return s_impl.FromEventPattern(addHandler, removeHandler);
         }
@@ -96,11 +96,11 @@ public static IObservable<EventPattern<object>> FromEventPattern(Action<EventHan
         public static IObservable<EventPattern<EventArgs>> FromEventPattern(Action<EventHandler> addHandler, Action<EventHandler> removeHandler, IScheduler scheduler)
         {
             if (addHandler == null)
-                throw new ArgumentNullException("addHandler");
+                throw new ArgumentNullException(nameof(addHandler));
             if (removeHandler == null)
-                throw new ArgumentNullException("removeHandler");
+                throw new ArgumentNullException(nameof(removeHandler));
             if (scheduler == null)
-                throw new ArgumentNullException("scheduler");
+                throw new ArgumentNullException(nameof(scheduler));
 
             return s_impl.FromEventPattern(addHandler, removeHandler, scheduler);
         }
@@ -521,9 +521,9 @@ public static IObservable<EventPattern<TEventArgs>> FromEventPattern<TEventArgs>
         public static IObservable<EventPattern<EventArgs>> FromEventPattern(object target, string eventName)
         {
             if (target == null)
-                throw new ArgumentNullException("target");
+                throw new ArgumentNullException(nameof(target));
             if (eventName == null)
-                throw new ArgumentNullException("eventName");
+                throw new ArgumentNullException(nameof(eventName));
 
             return s_impl.FromEventPattern(target, eventName);
         }
@@ -571,11 +571,11 @@ public static IObservable<EventPattern<object>> FromEventPattern(object target,
         public static IObservable<EventPattern<EventArgs>> FromEventPattern(object target, string eventName, IScheduler scheduler)
         {
             if (target == null)
-                throw new ArgumentNullException("target");
+                throw new ArgumentNullException(nameof(target));
             if (eventName == null)
-                throw new ArgumentNullException("eventName");
+                throw new ArgumentNullException(nameof(eventName));
             if (scheduler == null)
-                throw new ArgumentNullException("scheduler");
+                throw new ArgumentNullException(nameof(scheduler));
 
             return s_impl.FromEventPattern(target, eventName, scheduler);
         }
@@ -812,9 +812,9 @@ public static IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern<TS
         public static IObservable<EventPattern<EventArgs>> FromEventPattern(Type type, string eventName)
         {
             if (type == null)
-                throw new ArgumentNullException("type");
+                throw new ArgumentNullException(nameof(type));
             if (eventName == null)
-                throw new ArgumentNullException("eventName");
+                throw new ArgumentNullException(nameof(eventName));
 
             return s_impl.FromEventPattern(type, eventName);
         }
@@ -862,11 +862,11 @@ public static IObservable<EventPattern<object>> FromEventPattern(Type type, stri
         public static IObservable<EventPattern<EventArgs>> FromEventPattern(Type type, string eventName, IScheduler scheduler)
         {
             if (type == null)
-                throw new ArgumentNullException("type");
+                throw new ArgumentNullException(nameof(type));
             if (eventName == null)
-                throw new ArgumentNullException("eventName");
+                throw new ArgumentNullException(nameof(eventName));
             if (scheduler == null)
-                throw new ArgumentNullException("scheduler");
+                throw new ArgumentNullException(nameof(scheduler));
 
             return s_impl.FromEventPattern(type, eventName, scheduler);
         }