From 903a5027e079421d76853e3226a8cedfe8b984a8 Mon Sep 17 00:00:00 2001 From: Daniel Weber Date: Fri, 29 Jun 2018 21:00:11 +0200 Subject: [PATCH] Remove redundant field initializers. --- Rx.NET/Source/src/System.Reactive/Concurrency/AsyncLock.cs | 4 ++-- .../Source/src/System.Reactive/Concurrency/CatchScheduler.cs | 2 +- .../System.Reactive/Concurrency/LocalScheduler.TimerQueue.cs | 2 +- .../Source/src/System.Reactive/Internal/ScheduledObserver.cs | 2 +- Rx.NET/Source/src/System.Reactive/Linq/Observable/Merge.cs | 2 +- .../Threading/Tasks/TaskObservableExtensions.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/AsyncLock.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/AsyncLock.cs index c0866bfd64..c4ed183861 100644 --- a/Rx.NET/Source/src/System.Reactive/Concurrency/AsyncLock.cs +++ b/Rx.NET/Source/src/System.Reactive/Concurrency/AsyncLock.cs @@ -11,8 +11,8 @@ namespace System.Reactive.Concurrency /// public sealed class AsyncLock : IDisposable { - private bool isAcquired = false; - private bool hasFaulted = false; + private bool isAcquired; + private bool hasFaulted; private readonly object guard = new object(); private Queue<(Action action, Delegate @delegate, object state)> queue; diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs index cc77789c05..88d71016a4 100644 --- a/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs +++ b/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs @@ -96,7 +96,7 @@ private sealed class CatchSchedulerPeriodic : ISchedulerPeriodic private sealed class PeriodicallyScheduledWorkItem : IDisposable { private IDisposable _cancel; - private bool _failed = false; + private bool _failed; private readonly Func _action; private readonly CatchSchedulerPeriodic _catchScheduler; diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/LocalScheduler.TimerQueue.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/LocalScheduler.TimerQueue.cs index d09229aa87..3a90e9f637 100644 --- a/Rx.NET/Source/src/System.Reactive/Concurrency/LocalScheduler.TimerQueue.cs +++ b/Rx.NET/Source/src/System.Reactive/Concurrency/LocalScheduler.TimerQueue.cs @@ -41,7 +41,7 @@ public partial class LocalScheduler /// or can continue using the current timer (because no earlier long term work was /// added to the queue). /// - private static WorkItem s_nextLongTermWorkItem = null; + private static WorkItem s_nextLongTermWorkItem; /// /// Short term work queue. Contains work that's due soon, computed at the time of diff --git a/Rx.NET/Source/src/System.Reactive/Internal/ScheduledObserver.cs b/Rx.NET/Source/src/System.Reactive/Internal/ScheduledObserver.cs index c914cf3fc2..b48e578fb4 100644 --- a/Rx.NET/Source/src/System.Reactive/Internal/ScheduledObserver.cs +++ b/Rx.NET/Source/src/System.Reactive/Internal/ScheduledObserver.cs @@ -13,7 +13,7 @@ namespace System.Reactive internal class ScheduledObserver : ObserverBase, IScheduledObserver { - private int _state = 0; + private int _state; private const int STOPPED = 0; private const int RUNNING = 1; private const int PENDING = 2; diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Merge.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Merge.cs index ceafc745db..cd0dd0444c 100644 --- a/Rx.NET/Source/src/System.Reactive/Linq/Observable/Merge.cs +++ b/Rx.NET/Source/src/System.Reactive/Linq/Observable/Merge.cs @@ -40,7 +40,7 @@ public _(int maxConcurrent, IObserver observer) private Queue> _q = new Queue>(); private volatile bool _isStopped; private CompositeDisposable _group = new CompositeDisposable(); - private int _activeCount = 0; + private int _activeCount; public override void OnNext(IObservable value) { diff --git a/Rx.NET/Source/src/System.Reactive/Threading/Tasks/TaskObservableExtensions.cs b/Rx.NET/Source/src/System.Reactive/Threading/Tasks/TaskObservableExtensions.cs index 7ea48a023b..3f6c249b0c 100644 --- a/Rx.NET/Source/src/System.Reactive/Threading/Tasks/TaskObservableExtensions.cs +++ b/Rx.NET/Source/src/System.Reactive/Threading/Tasks/TaskObservableExtensions.cs @@ -309,7 +309,7 @@ private sealed class ToTaskObserver : SafeObserver { private readonly CancellationToken _ct; private readonly TaskCompletionSource _tcs; - private readonly CancellationTokenRegistration _ctr = default; + private readonly CancellationTokenRegistration _ctr; private bool _hasValue; private TResult _lastValue;