Fix field names.

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Amb.cs

@@ -71,11 +71,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        var firstEnumerator = _first.GetAsyncEnumerator(cancellationToken);
-                        var secondEnumerator = _second.GetAsyncEnumerator(cancellationToken);
+                        var firstEnumerator = _first.GetAsyncEnumerator(_cancellationToken);
+                        var secondEnumerator = _second.GetAsyncEnumerator(_cancellationToken);
 
                         var firstMoveNext = firstEnumerator.MoveNextAsync().AsTask();
                         var secondMoveNext = secondEnumerator.MoveNextAsync().AsTask();
@@ -110,11 +110,11 @@ namespace System.Linq
                             });
                         }
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
 
                         if (await winner.ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
@@ -123,7 +123,7 @@ namespace System.Linq
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
@@ -166,7 +166,7 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         var n = _sources.Length;
@@ -176,7 +176,7 @@ namespace System.Linq
 
                         for (var i = 0; i < n; i++)
                         {
-                            var enumerator = _sources[i].GetAsyncEnumerator(cancellationToken);
+                            var enumerator = _sources[i].GetAsyncEnumerator(_cancellationToken);
 
                             enumerators[i] = enumerator;
                             moveNexts[i] = enumerator.MoveNextAsync();
@@ -208,11 +208,11 @@ namespace System.Linq
                             }
                         }
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
 
                         if (await winner.ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
@@ -221,7 +221,7 @@ namespace System.Linq
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Buffer.cs

@@ -73,15 +73,15 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _buffers = new Queue<IList<TSource>>();
                         _index = 0;
                         _stopped = false;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -104,7 +104,7 @@ namespace System.Linq
 
                                     if (_buffers.Count > 0 && _buffers.Peek().Count == _count)
                                     {
-                                        current = _buffers.Dequeue();
+                                        _current = _buffers.Dequeue();
                                         return true;
                                     }
 
@@ -120,7 +120,7 @@ namespace System.Linq
 
                             if (_buffers.Count > 0)
                             {
-                                current = _buffers.Dequeue();
+                                _current = _buffers.Dequeue();
                                 return true;
                             }
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Catch.cs

@@ -100,13 +100,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _isDone = false;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -118,7 +118,7 @@ namespace System.Linq
                                 {
                                     if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                                     {
-                                        current = _enumerator.Current;
+                                        _current = _enumerator.Current;
                                         return true;
                                     }
                                 }
@@ -128,7 +128,7 @@ namespace System.Linq
                                     // invoking the handler, but we use this order to preserve
                                     // current behavior
                                     var inner = _handler(ex);
-                                    var err = inner.GetAsyncEnumerator(cancellationToken);
+                                    var err = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     if (_enumerator != null)
                                     {
@@ -143,7 +143,7 @@ namespace System.Linq
 
                             if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                             {
-                                current = _enumerator.Current;
+                                _current = _enumerator.Current;
                                 return true;
                             }
 
@@ -193,13 +193,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _isDone = false;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -211,7 +211,7 @@ namespace System.Linq
                                 {
                                     if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                                     {
-                                        current = _enumerator.Current;
+                                        _current = _enumerator.Current;
                                         return true;
                                     }
                                 }
@@ -221,7 +221,7 @@ namespace System.Linq
                                     // invoking the handler, but we use this order to preserve
                                     // current behavior
                                     var inner = await _handler(ex).ConfigureAwait(false);
-                                    var err = inner.GetAsyncEnumerator(cancellationToken);
+                                    var err = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     if (_enumerator != null)
                                     {
@@ -236,7 +236,7 @@ namespace System.Linq
 
                             if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                             {
-                                current = _enumerator.Current;
+                                _current = _enumerator.Current;
                                 return true;
                             }
 
@@ -293,12 +293,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _sourcesEnumerator = _sources.GetEnumerator();
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -314,14 +314,14 @@ namespace System.Linq
                                 }
 
                                 _error = null;
-                                _enumerator = _sourcesEnumerator.Current.GetAsyncEnumerator(cancellationToken);
+                                _enumerator = _sourcesEnumerator.Current.GetAsyncEnumerator(_cancellationToken);
                             }
 
                             try
                             {
                                 if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _enumerator.Current;
+                                    _current = _enumerator.Current;
                                     return true;
                                 }
                             }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Concat.cs

@@ -83,12 +83,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _outerEnumerator = _source.GetEnumerator();
                         _mode = State_OuterNext;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -103,7 +103,7 @@ namespace System.Linq
                                         await _currentEnumerator.DisposeAsync().ConfigureAwait(false);
                                     }
 
-                                    _currentEnumerator = _outerEnumerator.Current.GetAsyncEnumerator(cancellationToken);
+                                    _currentEnumerator = _outerEnumerator.Current.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_While;
                                     goto case State_While;
@@ -113,7 +113,7 @@ namespace System.Linq
                             case State_While:
                                 if (await _currentEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _currentEnumerator.Current;
+                                    _current = _currentEnumerator.Current;
                                     return true;
                                 }
 
@@ -172,12 +172,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _outerEnumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _outerEnumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _mode = State_OuterNext;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -192,7 +192,7 @@ namespace System.Linq
                                         await _currentEnumerator.DisposeAsync().ConfigureAwait(false);
                                     }
 
-                                    _currentEnumerator = _outerEnumerator.Current.GetAsyncEnumerator(cancellationToken);
+                                    _currentEnumerator = _outerEnumerator.Current.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_While;
                                     goto case State_While;
@@ -202,7 +202,7 @@ namespace System.Linq
                             case State_While:
                                 if (await _currentEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _currentEnumerator.Current;
+                                    _current = _currentEnumerator.Current;
                                     return true;
                                 }
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Distinct.cs

@@ -144,10 +144,10 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
 
                         if (!await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
@@ -158,9 +158,9 @@ namespace System.Linq
                         var element = _enumerator.Current;
                         _set = new Set<TKey>(_comparer);
                         _set.Add(_keySelector(element));
-                        current = element;
+                        _current = element;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         return true;
 
                     case AsyncIteratorState.Iterating:
@@ -169,7 +169,7 @@ namespace System.Linq
                             element = _enumerator.Current;
                             if (_set.Add(_keySelector(element)))
                             {
-                                current = element;
+                                _current = element;
                                 return true;
                             }
                         }
@@ -289,10 +289,10 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
 
                         if (!await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
@@ -303,9 +303,9 @@ namespace System.Linq
                         var element = _enumerator.Current;
                         _set = new Set<TKey>(_comparer);
                         _set.Add(await _keySelector(element).ConfigureAwait(false));
-                        current = element;
+                        _current = element;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         return true;
 
                     case AsyncIteratorState.Iterating:
@@ -314,7 +314,7 @@ namespace System.Linq
                             element = _enumerator.Current;
                             if (_set.Add(await _keySelector(element).ConfigureAwait(false)))
                             {
-                                current = element;
+                                _current = element;
                                 return true;
                             }
                         }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/DistinctUntilChanged.cs

@@ -120,11 +120,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -142,7 +142,7 @@ namespace System.Linq
                             {
                                 _hasCurrentValue = true;
                                 _currentValue = item;
-                                current = item;
+                                _current = item;
                                 return true;
                             }
                         }
@@ -191,11 +191,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -213,7 +213,7 @@ namespace System.Linq
                             {
                                 _hasCurrentKey = true;
                                 _currentKeyValue = key;
-                                current = item;
+                                _current = item;
                                 return true;
                             }
                         }
@@ -262,11 +262,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -284,7 +284,7 @@ namespace System.Linq
                             {
                                 _hasCurrentKey = true;
                                 _currentKeyValue = key;
-                                current = item;
+                                _current = item;
                                 return true;
                             }
                         }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Do.cs

@@ -165,11 +165,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -177,8 +177,8 @@ namespace System.Linq
                         {
                             if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                             {
-                                current = _enumerator.Current;
-                                _onNext(current);
+                                _current = _enumerator.Current;
+                                _onNext(_current);
 
                                 return true;
                             }
@@ -241,11 +241,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -253,8 +253,8 @@ namespace System.Linq
                         {
                             if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                             {
-                                current = _enumerator.Current;
-                                await _onNext(current).ConfigureAwait(false);
+                                _current = _enumerator.Current;
+                                await _onNext(_current).ConfigureAwait(false);
 
                                 return true;
                             }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Expand.cs

@@ -69,13 +69,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _queue = new Queue<IAsyncEnumerable<TSource>>();
                         _queue.Enqueue(_source);
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -92,7 +92,7 @@ namespace System.Linq
                                         await _enumerator.DisposeAsync().ConfigureAwait(false);
                                     }
 
-                                    _enumerator = src.GetAsyncEnumerator(cancellationToken);
+                                    _enumerator = src.GetAsyncEnumerator(_cancellationToken);
 
                                     continue; // loop
                                 }
@@ -105,7 +105,7 @@ namespace System.Linq
                                 var item = _enumerator.Current;
                                 var next = _selector(item);
                                 _queue.Enqueue(next);
-                                current = item;
+                                _current = item;
                                 return true;
                             }
 
@@ -159,13 +159,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _queue = new Queue<IAsyncEnumerable<TSource>>();
                         _queue.Enqueue(_source);
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -182,7 +182,7 @@ namespace System.Linq
                                         await _enumerator.DisposeAsync().ConfigureAwait(false);
                                     }
 
-                                    _enumerator = src.GetAsyncEnumerator(cancellationToken);
+                                    _enumerator = src.GetAsyncEnumerator(_cancellationToken);
 
                                     continue; // loop
                                 }
@@ -195,7 +195,7 @@ namespace System.Linq
                                 var item = _enumerator.Current;
                                 var next = await _selector(item).ConfigureAwait(false);
                                 _queue.Enqueue(next);
-                                current = item;
+                                _current = item;
                                 return true;
                             }
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Finally.cs

@@ -67,17 +67,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
@@ -125,17 +125,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Generate.cs

@@ -60,13 +60,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _started = false;
                         _currentState = _initialState;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -79,7 +79,7 @@ namespace System.Linq
 
                         if (_condition(_currentState))
                         {
-                            current = _resultSelector(_currentState);
+                            _current = _resultSelector(_currentState);
                             return true;
                         }
                         break;

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/IgnoreElements.cs

@@ -49,11 +49,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Merge.cs

@@ -78,7 +78,7 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         var n = _sources.Length;
@@ -89,12 +89,12 @@ namespace System.Linq
 
                         for (var i = 0; i < n; i++)
                         {
-                            var enumerator = _sources[i].GetAsyncEnumerator(cancellationToken);
+                            var enumerator = _sources[i].GetAsyncEnumerator(_cancellationToken);
                             _enumerators[i] = enumerator;
                             _moveNexts[i] = enumerator.MoveNextAsync();
                         }
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -118,7 +118,7 @@ namespace System.Linq
                             else
                             {
                                 var enumerator = _enumerators[index];
-                                current = enumerator.Current;
+                                _current = enumerator.Current;
                                 _moveNexts[index] = enumerator.MoveNextAsync();
                                 return true;
                             }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/OnErrorResumeNext.cs

@@ -80,12 +80,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _sourcesEnumerator = _sources.GetEnumerator();
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -98,14 +98,14 @@ namespace System.Linq
                                     break; // while -- done, nothing else to do
                                 }
 
-                                _enumerator = _sourcesEnumerator.Current.GetAsyncEnumerator(cancellationToken);
+                                _enumerator = _sourcesEnumerator.Current.GetAsyncEnumerator(_cancellationToken);
                             }
 
                             try
                             {
                                 if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _enumerator.Current;
+                                    _current = _enumerator.Current;
                                     return true;
                                 }
                             }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Repeat.cs

@@ -50,9 +50,9 @@ namespace System.Linq
 
             protected override ValueTask<bool> MoveNextCore()
             {
-                cancellationToken.ThrowIfCancellationRequested();
+                _cancellationToken.ThrowIfCancellationRequested();
 
-                current = _element;
+                _current = _element;
                 return new ValueTask<bool>(true);
             }
         }
@@ -94,7 +94,7 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
 
@@ -107,15 +107,15 @@ namespace System.Linq
                         if (!_isInfinite && _currentCount-- == 0)
                             break;
 
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
 
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Scan.cs

@@ -89,14 +89,14 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _hasSeed = false;
                         _accumulated = default;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -112,7 +112,7 @@ namespace System.Linq
                             }
 
                             _accumulated = _accumulator(_accumulated, item);
-                            current = _accumulated;
+                            _current = _accumulated;
                             return true;
                         }
 
@@ -163,13 +163,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _accumulated = _seed;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -177,7 +177,7 @@ namespace System.Linq
                         {
                             var item = _enumerator.Current;
                             _accumulated = _accumulator(_accumulated, item);
-                            current = _accumulated;
+                            _current = _accumulated;
                             return true;
                         }
 
@@ -227,14 +227,14 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _hasSeed = false;
                         _accumulated = default;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -250,7 +250,7 @@ namespace System.Linq
                             }
 
                             _accumulated = await _accumulator(_accumulated, item).ConfigureAwait(false);
-                            current = _accumulated;
+                            _current = _accumulated;
                             return true;
                         }
 
@@ -301,13 +301,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _accumulated = _seed;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -315,7 +315,7 @@ namespace System.Linq
                         {
                             var item = _enumerator.Current;
                             _accumulated = await _accumulator(_accumulated, item).ConfigureAwait(false);
-                            current = _accumulated;
+                            _current = _accumulated;
                             return true;
                         }
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Timeout.cs

@@ -56,12 +56,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -86,7 +86,7 @@ namespace System.Linq
 
                         if (await moveNext.ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Using.cs

@@ -76,18 +76,18 @@ namespace System.Linq
                 //     GetAsyncEnumerator. This is inconsistent with asynchronous "using" and with a C# 8.0 async iterator with
                 //     a using statement inside, so this logic got moved to MoveNextAsync instead.
 
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _resource = _resourceFactory();
-                        _enumerator = _enumerableFactory(_resource).GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _enumerableFactory(_resource).GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
@@ -141,20 +141,20 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _resource = await _resourceFactory().ConfigureAwait(false);
                         _enumerable = await _enumerableFactory(_resource).ConfigureAwait(false);
 
-                        _enumerator = _enumerable.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _enumerable.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 

Ix.NET/Source/System.Linq.Async/System/Linq/AsyncEnumerablePartition.cs

@@ -109,14 +109,14 @@ namespace System.Linq
 
         protected override async ValueTask<bool> MoveNextCore()
         {
-            switch (state)
+            switch (_state)
             {
                 case AsyncIteratorState.Allocated:
-                    _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                    _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                     _hasSkipped = false;
                     _taken = 0;
 
-                    state = AsyncIteratorState.Iterating;
+                    _state = AsyncIteratorState.Iterating;
                     goto case AsyncIteratorState.Iterating;
 
                 case AsyncIteratorState.Iterating:
@@ -141,7 +141,7 @@ namespace System.Linq
                             _taken++;
                         }
 
-                        current = _enumerator.Current;
+                        _current = _enumerator.Current;
                         return true;
                     }
 

Ix.NET/Source/System.Linq.Async/System/Linq/AsyncEnumerator.cs

@@ -141,16 +141,16 @@ namespace System.Collections.Generic
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _moveNext().ConfigureAwait(false))
                         {
-                            current = _currentFunc();
+                            _current = _currentFunc();
                             return true;
                         }
 

Ix.NET/Source/System.Linq.Async/System/Linq/AsyncIterator.cs

@@ -12,9 +12,9 @@ namespace System.Linq
     {
         private readonly int _threadId;
 
-        protected TSource current;
-        protected AsyncIteratorState state = AsyncIteratorState.New;
-        protected CancellationToken cancellationToken;
+        protected TSource _current;
+        protected AsyncIteratorState _state = AsyncIteratorState.New;
+        protected CancellationToken _cancellationToken;
 
         protected AsyncIterator()
         {
@@ -23,25 +23,25 @@ namespace System.Linq
 
         public IAsyncEnumerator<TSource> GetAsyncEnumerator(CancellationToken cancellationToken)
         {
-            var enumerator = state == AsyncIteratorState.New && _threadId == Environment.CurrentManagedThreadId
+            var enumerator = _state == AsyncIteratorState.New && _threadId == Environment.CurrentManagedThreadId
                 ? this
                 : Clone();
 
-            enumerator.state = AsyncIteratorState.Allocated;
-            enumerator.cancellationToken = cancellationToken;
+            enumerator._state = AsyncIteratorState.Allocated;
+            enumerator._cancellationToken = cancellationToken;
 
             return enumerator;
         }
 
         public virtual ValueTask DisposeAsync()
         {
-            current = default;
-            state = AsyncIteratorState.Disposed;
+            _current = default;
+            _state = AsyncIteratorState.Disposed;
 
             return TaskExt.CompletedTask;
         }
 
-        public TSource Current => current;
+        public TSource Current => _current;
 
         public async ValueTask<bool> MoveNextAsync()
         {
@@ -49,7 +49,7 @@ namespace System.Linq
             // that any exceptions thrown from the MoveNextCore call are handled 
             // by the try/catch, whether they're sync or async
 
-            if (state == AsyncIteratorState.Disposed)
+            if (_state == AsyncIteratorState.Disposed)
             {
                 return false;
             }

Ix.NET/Source/System.Linq.Async/System/Linq/AsyncListPartition.cs

@@ -42,7 +42,7 @@ namespace System.Linq
         {
             if ((uint)_index <= (uint)(_maxIndexInclusive - _minIndexInclusive) && _index < _source.Count - _minIndexInclusive)
             {
-                current = _source[_minIndexInclusive + _index];
+                _current = _source[_minIndexInclusive + _index];
                 ++_index;
                 return true;
             }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/AppendPrepend.cs

@@ -62,7 +62,7 @@ namespace System.Linq
             {
                 if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                 {
-                    current = _enumerator.Current;
+                    _current = _enumerator.Current;
                     return true;
                 }
 
@@ -112,14 +112,14 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _hasEnumerator = false;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         if (!_appending)
                         {
-                            current = _item;
+                            _current = _item;
                             return true;
                         }
 
@@ -128,7 +128,7 @@ namespace System.Linq
                     case AsyncIteratorState.Iterating:
                         if (!_hasEnumerator)
                         {
-                            GetSourceEnumerator(cancellationToken);
+                            GetSourceEnumerator(_cancellationToken);
                             _hasEnumerator = true;
                         }
 
@@ -141,7 +141,7 @@ namespace System.Linq
 
                             if (_appending)
                             {
-                                current = _item;
+                                _current = _item;
                                 return true;
                             }
                         }
@@ -315,11 +315,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _mode = 1;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -333,12 +333,12 @@ namespace System.Linq
                             case 2:
                                 if (_node != null)
                                 {
-                                    current = _node.Item;
+                                    _current = _node.Item;
                                     _node = _node.Linked;
                                     return true;
                                 }
 
-                                GetSourceEnumerator(cancellationToken);
+                                GetSourceEnumerator(_cancellationToken);
                                 _mode = 3;
                                 goto case 3;
 
@@ -361,7 +361,7 @@ namespace System.Linq
                             case 4:
                                 if (_appendedEnumerator.MoveNext())
                                 {
-                                    current = _appendedEnumerator.Current;
+                                    _current = _appendedEnumerator.Current;
                                     return true;
                                 }
                                 break;

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Cast.cs

@@ -55,17 +55,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = (TResult)_enumerator.Current;
+                            _current = (TResult)_enumerator.Current;
                             return true;
                         }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Concat.cs

@@ -143,20 +143,20 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                if (state == AsyncIteratorState.Allocated)
+                if (_state == AsyncIteratorState.Allocated)
                 {
-                    _enumerator = GetAsyncEnumerable(0).GetAsyncEnumerator(cancellationToken);
-                    state = AsyncIteratorState.Iterating;
+                    _enumerator = GetAsyncEnumerable(0).GetAsyncEnumerator(_cancellationToken);
+                    _state = AsyncIteratorState.Iterating;
                     _counter = 2;
                 }
 
-                if (state == AsyncIteratorState.Iterating)
+                if (_state == AsyncIteratorState.Iterating)
                 {
                     while (true)
                     {
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
                         // note, this is simply to match the logic of 
@@ -165,7 +165,7 @@ namespace System.Linq
                         if (next != null)
                         {
                             await _enumerator.DisposeAsync().ConfigureAwait(false);
-                            _enumerator = next.GetAsyncEnumerator(cancellationToken);
+                            _enumerator = next.GetAsyncEnumerator(_cancellationToken);
                             continue;
                         }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/DefaultIfEmpty.cs

@@ -61,29 +61,29 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
-                            state = AsyncIteratorState.Iterating;
+                            _current = _enumerator.Current;
+                            _state = AsyncIteratorState.Iterating;
                         }
                         else
                         {
-                            current = _defaultValue;
+                            _current = _defaultValue;
                             await _enumerator.DisposeAsync().ConfigureAwait(false);
                             _enumerator = null;
 
-                            state = AsyncIteratorState.Disposed;
+                            _state = AsyncIteratorState.Disposed;
                         }
                         return true;
 
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
                         break;

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Distinct.cs

@@ -90,10 +90,10 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         if (!await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
                             await DisposeAsync().ConfigureAwait(false);
@@ -103,9 +103,9 @@ namespace System.Linq
                         var element = _enumerator.Current;
                         _set = new Set<TSource>(_comparer);
                         _set.Add(element);
-                        current = element;
+                        _current = element;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         return true;
 
                     case AsyncIteratorState.Iterating:
@@ -114,7 +114,7 @@ namespace System.Linq
                             element = _enumerator.Current;
                             if (_set.Add(element))
                             {
-                                current = element;
+                                _current = element;
                                 return true;
                             }
                         }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Except.cs

@@ -75,13 +75,13 @@ namespace System.Linq
                 //     concurrency, which isn't a great default behavior because it's very hard to suppress or control
                 //     this behavior.
 
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _set = await AsyncEnumerableHelpers.ToSet(_second, _comparer, cancellationToken).ConfigureAwait(false);
-                        _firstEnumerator = _first.GetAsyncEnumerator(cancellationToken);
+                        _set = await AsyncEnumerableHelpers.ToSet(_second, _comparer, _cancellationToken).ConfigureAwait(false);
+                        _firstEnumerator = _first.GetAsyncEnumerator(_cancellationToken);
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -95,7 +95,7 @@ namespace System.Linq
                                 var item = _firstEnumerator.Current;
                                 if (_set.Add(item))
                                 {
-                                    current = item;
+                                    _current = item;
                                     return true;
                                 }
                             }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/GroupBy.cs

@@ -244,18 +244,18 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _lookup = await Internal.Lookup<TKey, TSource>.CreateAsync(_source, _keySelector, _comparer, cancellationToken).ConfigureAwait(false);
+                        _lookup = await Internal.Lookup<TKey, TSource>.CreateAsync(_source, _keySelector, _comparer, _cancellationToken).ConfigureAwait(false);
                         _enumerator = _lookup.ApplyResultSelector(_resultSelector).GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
@@ -337,18 +337,18 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _lookup = await Internal.LookupWithTask<TKey, TSource>.CreateAsync(_source, _keySelector, _comparer, cancellationToken).ConfigureAwait(false);
-                        _enumerator = _lookup.Select(async g => await _resultSelector(g.Key, g).ConfigureAwait(false)).GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _lookup = await Internal.LookupWithTask<TKey, TSource>.CreateAsync(_source, _keySelector, _comparer, _cancellationToken).ConfigureAwait(false);
+                        _enumerator = _lookup.Select(async g => await _resultSelector(g.Key, g).ConfigureAwait(false)).GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
@@ -430,18 +430,18 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _lookup = await Internal.Lookup<TKey, TElement>.CreateAsync(_source, _keySelector, _elementSelector, _comparer, cancellationToken).ConfigureAwait(false);
+                        _lookup = await Internal.Lookup<TKey, TElement>.CreateAsync(_source, _keySelector, _elementSelector, _comparer, _cancellationToken).ConfigureAwait(false);
                         _enumerator = _lookup.GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = (IAsyncGrouping<TKey, TElement>)_enumerator.Current;
+                            _current = (IAsyncGrouping<TKey, TElement>)_enumerator.Current;
                             return true;
                         }
 
@@ -523,18 +523,18 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _lookup = await Internal.LookupWithTask<TKey, TElement>.CreateAsync(_source, _keySelector, _elementSelector, _comparer, cancellationToken).ConfigureAwait(false);
+                        _lookup = await Internal.LookupWithTask<TKey, TElement>.CreateAsync(_source, _keySelector, _elementSelector, _comparer, _cancellationToken).ConfigureAwait(false);
                         _enumerator = _lookup.GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = (IAsyncGrouping<TKey, TElement>)_enumerator.Current;
+                            _current = (IAsyncGrouping<TKey, TElement>)_enumerator.Current;
                             return true;
                         }
 
@@ -612,18 +612,18 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _lookup = await Internal.Lookup<TKey, TSource>.CreateAsync(_source, _keySelector, _comparer, cancellationToken).ConfigureAwait(false);
+                        _lookup = await Internal.Lookup<TKey, TSource>.CreateAsync(_source, _keySelector, _comparer, _cancellationToken).ConfigureAwait(false);
                         _enumerator = _lookup.GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = (IAsyncGrouping<TKey, TSource>)_enumerator.Current;
+                            _current = (IAsyncGrouping<TKey, TSource>)_enumerator.Current;
                             return true;
                         }
 
@@ -701,18 +701,18 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _lookup = await Internal.LookupWithTask<TKey, TSource>.CreateAsync(_source, _keySelector, _comparer, cancellationToken).ConfigureAwait(false);
+                        _lookup = await Internal.LookupWithTask<TKey, TSource>.CreateAsync(_source, _keySelector, _comparer, _cancellationToken).ConfigureAwait(false);
                         _enumerator = _lookup.GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = (IAsyncGrouping<TKey, TSource>)_enumerator.Current;
+                            _current = (IAsyncGrouping<TKey, TSource>)_enumerator.Current;
                             return true;
                         }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Intersect.cs

@@ -75,13 +75,13 @@ namespace System.Linq
                 //     concurrency, which isn't a great default behavior because it's very hard to suppress or control
                 //     this behavior.
 
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _set = await AsyncEnumerableHelpers.ToSet(_second, _comparer, cancellationToken).ConfigureAwait(false);
-                        _firstEnumerator = _first.GetAsyncEnumerator(cancellationToken);
+                        _set = await AsyncEnumerableHelpers.ToSet(_second, _comparer, _cancellationToken).ConfigureAwait(false);
+                        _firstEnumerator = _first.GetAsyncEnumerator(_cancellationToken);
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -96,7 +96,7 @@ namespace System.Linq
                                 var item = _firstEnumerator.Current;
                                 if (_set.Remove(item))
                                 {
-                                    current = item;
+                                    _current = item;
                                     return true;
                                 }
                             }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Join.cs

@@ -133,12 +133,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _outerEnumerator = _outer.GetAsyncEnumerator(cancellationToken);
+                        _outerEnumerator = _outer.GetAsyncEnumerator(_cancellationToken);
                         _mode = State_If;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -147,7 +147,7 @@ namespace System.Linq
                             case State_If:
                                 if (await _outerEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    _lookup = await Internal.Lookup<TKey, TInner>.CreateForJoinAsync(_inner, _innerKeySelector, _comparer, cancellationToken).ConfigureAwait(false);
+                                    _lookup = await Internal.Lookup<TKey, TInner>.CreateForJoinAsync(_inner, _innerKeySelector, _comparer, _cancellationToken).ConfigureAwait(false);
 
                                     if (_lookup.Count != 0)
                                     {
@@ -175,7 +175,7 @@ namespace System.Linq
                                 goto case State_While;
 
                             case State_For:
-                                current = _resultSelector(_item, _elements[_index]);
+                                _current = _resultSelector(_item, _elements[_index]);
                                 _index++;
                                 if (_index == _count)
                                 {
@@ -260,12 +260,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _outerEnumerator = _outer.GetAsyncEnumerator(cancellationToken);
+                        _outerEnumerator = _outer.GetAsyncEnumerator(_cancellationToken);
                         _mode = State_If;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -274,7 +274,7 @@ namespace System.Linq
                             case State_If:
                                 if (await _outerEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    _lookup = await Internal.LookupWithTask<TKey, TInner>.CreateForJoinAsync(_inner, _innerKeySelector, _comparer, cancellationToken).ConfigureAwait(false);
+                                    _lookup = await Internal.LookupWithTask<TKey, TInner>.CreateForJoinAsync(_inner, _innerKeySelector, _comparer, _cancellationToken).ConfigureAwait(false);
 
                                     if (_lookup.Count != 0)
                                     {
@@ -302,7 +302,7 @@ namespace System.Linq
                                 goto case State_While;
 
                             case State_For:
-                                current = await _resultSelector(_item, _elements[_index]).ConfigureAwait(false);
+                                _current = await _resultSelector(_item, _elements[_index]).ConfigureAwait(false);
                                 _index++;
                                 if (_index == _count)
                                 {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/OfType.cs

@@ -49,11 +49,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -62,7 +62,7 @@ namespace System.Linq
                             var item = _enumerator.Current;
                             if (item is TResult res)
                             {
-                                current = res;
+                                _current = res;
                                 return true;
                             }
                         }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/OrderedAsyncEnumerable.cs

@@ -30,10 +30,10 @@ namespace System.Linq
 
         protected override async ValueTask<bool> MoveNextCore()
         {
-            switch (state)
+            switch (_state)
             {
                 case AsyncIteratorState.Allocated:
-                    _buffer = await _source.ToArray(cancellationToken).ConfigureAwait(false);
+                    _buffer = await _source.ToArray(_cancellationToken).ConfigureAwait(false);
 
                     // REVIEW: If we add selectors with CancellationToken support, we should feed the token to Sort.
 
@@ -41,13 +41,13 @@ namespace System.Linq
                     _indexes = await sorter.Sort(_buffer, _buffer.Length).ConfigureAwait(false);
                     _index = 0;
 
-                    state = AsyncIteratorState.Iterating;
+                    _state = AsyncIteratorState.Iterating;
                     goto case AsyncIteratorState.Iterating;
 
                 case AsyncIteratorState.Iterating:
                     if (_index < _buffer.Length)
                     {
-                        current = _buffer[_indexes[_index++]];
+                        _current = _buffer[_indexes[_index++]];
                         return true;
                     }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Range.cs

@@ -109,18 +109,18 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        current = _start;
+                        _current = _start;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         return true;
 
                     case AsyncIteratorState.Iterating:
-                        current++;
+                        _current++;
 
-                        if (current != _end)
+                        if (_current != _end)
                         {
                             return true;
                         }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Repeat.cs

@@ -60,17 +60,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _remaining = _count;
 
                         if (_remaining > 0)
                         {
-                            current = _element;
+                            _current = _element;
                         }
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
 
                         goto case AsyncIteratorState.Iterating;
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Reverse.cs

@@ -89,19 +89,19 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _items = await _source.ToArray(cancellationToken).ConfigureAwait(false);
+                        _items = await _source.ToArray(_cancellationToken).ConfigureAwait(false);
                         _index = _items.Length - 1;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_index != -1)
                         {
-                            current = _items[_index];
+                            _current = _items[_index];
                             --_index;
                             return true;
                         }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Select.cs

@@ -120,17 +120,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _selector(_enumerator.Current);
+                            _current = _selector(_enumerator.Current);
                             return true;
                         }
 
@@ -176,12 +176,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -191,7 +191,7 @@ namespace System.Linq
                             {
                                 _index++;
                             }
-                            current = _selector(_enumerator.Current, _index);
+                            _current = _selector(_enumerator.Current, _index);
                             return true;
                         }
 
@@ -291,17 +291,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _enumerator = _source.GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = _selector(_enumerator.Current);
+                            _current = _selector(_enumerator.Current);
                             return true;
                         }
 
@@ -352,17 +352,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = await _selector(_enumerator.Current).ConfigureAwait(false);
+                            _current = await _selector(_enumerator.Current).ConfigureAwait(false);
                             return true;
                         }
 
@@ -408,12 +408,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -423,7 +423,7 @@ namespace System.Linq
                             {
                                 _index++;
                             }
-                            current = await _selector(_enumerator.Current, _index).ConfigureAwait(false);
+                            _current = await _selector(_enumerator.Current, _index).ConfigureAwait(false);
                             return true;
                         }
 
@@ -533,17 +533,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _enumerator = _source.GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = await _selector(_enumerator.Current).ConfigureAwait(false);
+                            _current = await _selector(_enumerator.Current).ConfigureAwait(false);
                             return true;
                         }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SelectMany.cs

@@ -144,12 +144,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _sourceEnumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _sourceEnumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _mode = State_Source;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -164,7 +164,7 @@ namespace System.Linq
                                     }
 
                                     var inner = _selector(_sourceEnumerator.Current);
-                                    _resultEnumerator = inner.GetAsyncEnumerator(cancellationToken);
+                                    _resultEnumerator = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_Result;
                                     goto case State_Result;
@@ -174,7 +174,7 @@ namespace System.Linq
                             case State_Result:
                                 if (await _resultEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _resultEnumerator.Current;
+                                    _current = _resultEnumerator.Current;
                                     return true;
                                 }
 
@@ -235,12 +235,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _sourceEnumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _sourceEnumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _mode = State_Source;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -255,7 +255,7 @@ namespace System.Linq
                                     }
 
                                     var inner = await _selector(_sourceEnumerator.Current).ConfigureAwait(false);
-                                    _resultEnumerator = inner.GetAsyncEnumerator(cancellationToken);
+                                    _resultEnumerator = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_Result;
                                     goto case State_Result;
@@ -265,7 +265,7 @@ namespace System.Linq
                             case State_Result:
                                 if (await _resultEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _resultEnumerator.Current;
+                                    _current = _resultEnumerator.Current;
                                     return true;
                                 }
 
@@ -332,12 +332,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _sourceEnumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _sourceEnumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _mode = State_Source;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -353,7 +353,7 @@ namespace System.Linq
 
                                     _currentSource = _sourceEnumerator.Current;
                                     var inner = _collectionSelector(_currentSource);
-                                    _resultEnumerator = inner.GetAsyncEnumerator(cancellationToken);
+                                    _resultEnumerator = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_Result;
                                     goto case State_Result;
@@ -363,7 +363,7 @@ namespace System.Linq
                             case State_Result:
                                 if (await _resultEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _resultSelector(_currentSource, _resultEnumerator.Current);
+                                    _current = _resultSelector(_currentSource, _resultEnumerator.Current);
                                     return true;
                                 }
 
@@ -430,12 +430,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _sourceEnumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _sourceEnumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _mode = State_Source;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -451,7 +451,7 @@ namespace System.Linq
 
                                     _currentSource = _sourceEnumerator.Current;
                                     var inner = await _collectionSelector(_currentSource).ConfigureAwait(false);
-                                    _resultEnumerator = inner.GetAsyncEnumerator(cancellationToken);
+                                    _resultEnumerator = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_Result;
                                     goto case State_Result;
@@ -461,7 +461,7 @@ namespace System.Linq
                             case State_Result:
                                 if (await _resultEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = await _resultSelector(_currentSource, _resultEnumerator.Current).ConfigureAwait(false);
+                                    _current = await _resultSelector(_currentSource, _resultEnumerator.Current).ConfigureAwait(false);
                                     return true;
                                 }
 
@@ -529,13 +529,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _sourceEnumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _sourceEnumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
                         _mode = State_Source;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -557,7 +557,7 @@ namespace System.Linq
                                     }
 
                                     var inner = _collectionSelector(_currentSource, _index);
-                                    _resultEnumerator = inner.GetAsyncEnumerator(cancellationToken);
+                                    _resultEnumerator = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_Result;
                                     goto case State_Result;
@@ -567,7 +567,7 @@ namespace System.Linq
                             case State_Result:
                                 if (await _resultEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _resultSelector(_currentSource, _resultEnumerator.Current);
+                                    _current = _resultSelector(_currentSource, _resultEnumerator.Current);
                                     return true;
                                 }
 
@@ -635,13 +635,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _sourceEnumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _sourceEnumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
                         _mode = State_Source;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -663,7 +663,7 @@ namespace System.Linq
                                     }
 
                                     var inner = await _collectionSelector(_currentSource, _index).ConfigureAwait(false);
-                                    _resultEnumerator = inner.GetAsyncEnumerator(cancellationToken);
+                                    _resultEnumerator = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_Result;
                                     goto case State_Result;
@@ -673,7 +673,7 @@ namespace System.Linq
                             case State_Result:
                                 if (await _resultEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = await _resultSelector(_currentSource, _resultEnumerator.Current).ConfigureAwait(false);
+                                    _current = await _resultSelector(_currentSource, _resultEnumerator.Current).ConfigureAwait(false);
                                     return true;
                                 }
 
@@ -735,13 +735,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _sourceEnumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _sourceEnumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
                         _mode = State_Source;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -761,7 +761,7 @@ namespace System.Linq
                                     }
 
                                     var inner = _selector(_sourceEnumerator.Current, _index);
-                                    _resultEnumerator = inner.GetAsyncEnumerator(cancellationToken);
+                                    _resultEnumerator = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_Result;
                                     goto case State_Result;
@@ -771,7 +771,7 @@ namespace System.Linq
                             case State_Result:
                                 if (await _resultEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _resultEnumerator.Current;
+                                    _current = _resultEnumerator.Current;
                                     return true;
                                 }
 
@@ -833,13 +833,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _sourceEnumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _sourceEnumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
                         _mode = State_Source;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -859,7 +859,7 @@ namespace System.Linq
                                     }
 
                                     var inner = await _selector(_sourceEnumerator.Current, _index).ConfigureAwait(false);
-                                    _resultEnumerator = inner.GetAsyncEnumerator(cancellationToken);
+                                    _resultEnumerator = inner.GetAsyncEnumerator(_cancellationToken);
 
                                     _mode = State_Result;
                                     goto case State_Result;
@@ -869,7 +869,7 @@ namespace System.Linq
                             case State_Result:
                                 if (await _resultEnumerator.MoveNextAsync().ConfigureAwait(false))
                                 {
-                                    current = _resultEnumerator.Current;
+                                    _current = _resultEnumerator.Current;
                                     return true;
                                 }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SkipLast.cs

@@ -68,13 +68,13 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _queue = new Queue<TSource>();
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
 
@@ -86,7 +86,7 @@ namespace System.Linq
 
                             if (_queue.Count > _count)
                             {
-                                current = _queue.Dequeue();
+                                _current = _queue.Dequeue();
                                 return true;
                             }
                         }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SkipWhile.cs

@@ -86,10 +86,10 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
 
                         // skip elements as requested
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
@@ -98,7 +98,7 @@ namespace System.Linq
                             if (!_predicate(element))
                             {
                                 _doMoveNext = false;
-                                state = AsyncIteratorState.Iterating;
+                                _state = AsyncIteratorState.Iterating;
                                 goto case AsyncIteratorState.Iterating;
                             }
                         }
@@ -108,13 +108,13 @@ namespace System.Linq
                     case AsyncIteratorState.Iterating:
                         if (_doMoveNext && await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
                         if (!_doMoveNext)
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             _doMoveNext = true;
                             return true;
                         }
@@ -163,10 +163,10 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
 
                         // skip elements as requested
@@ -181,7 +181,7 @@ namespace System.Linq
                             if (!_predicate(element, _index))
                             {
                                 _doMoveNext = false;
-                                state = AsyncIteratorState.Iterating;
+                                _state = AsyncIteratorState.Iterating;
                                 goto case AsyncIteratorState.Iterating;
                             }
                         }
@@ -191,13 +191,13 @@ namespace System.Linq
                     case AsyncIteratorState.Iterating:
                         if (_doMoveNext && await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
                         if (!_doMoveNext)
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             _doMoveNext = true;
                             return true;
                         }
@@ -245,10 +245,10 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
 
                         // skip elements as requested
                         while (await _enumerator.MoveNextAsync().ConfigureAwait(false))
@@ -257,7 +257,7 @@ namespace System.Linq
                             if (!await _predicate(element).ConfigureAwait(false))
                             {
                                 _doMoveNext = false;
-                                state = AsyncIteratorState.Iterating;
+                                _state = AsyncIteratorState.Iterating;
                                 goto case AsyncIteratorState.Iterating;
                             }
                         }
@@ -267,13 +267,13 @@ namespace System.Linq
                     case AsyncIteratorState.Iterating:
                         if (_doMoveNext && await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
                         if (!_doMoveNext)
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             _doMoveNext = true;
                             return true;
                         }
@@ -322,10 +322,10 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
 
                         // skip elements as requested
@@ -340,7 +340,7 @@ namespace System.Linq
                             if (!await _predicate(element, _index).ConfigureAwait(false))
                             {
                                 _doMoveNext = false;
-                                state = AsyncIteratorState.Iterating;
+                                _state = AsyncIteratorState.Iterating;
                                 goto case AsyncIteratorState.Iterating;
                             }
                         }
@@ -350,13 +350,13 @@ namespace System.Linq
                     case AsyncIteratorState.Iterating:
                         if (_doMoveNext && await _enumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
                         if (!_doMoveNext)
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             _doMoveNext = true;
                             return true;
                         }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/TakeLast.cs

@@ -61,14 +61,14 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _queue = new Queue<TSource>();
                         _isDone = false;
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
 
@@ -102,7 +102,7 @@ namespace System.Linq
 
                             if (_queue.Count > 0)
                             {
-                                current = _queue.Dequeue();
+                                _current = _queue.Dequeue();
                                 return true;
                             }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/TakeWhile.cs

@@ -85,12 +85,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
 
@@ -103,7 +103,7 @@ namespace System.Linq
                                 break;
                             }
 
-                            current = item;
+                            _current = item;
                             return true;
                         }
 
@@ -150,12 +150,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
 
@@ -173,7 +173,7 @@ namespace System.Linq
                                 break;
                             }
 
-                            current = item;
+                            _current = item;
                             return true;
                         }
 
@@ -219,12 +219,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
 
@@ -237,7 +237,7 @@ namespace System.Linq
                                 break;
                             }
 
-                            current = item;
+                            _current = item;
                             return true;
                         }
 
@@ -284,12 +284,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
 
@@ -307,7 +307,7 @@ namespace System.Linq
                                 break;
                             }
 
-                            current = item;
+                            _current = item;
                             return true;
                         }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ToAsyncEnumerable.cs

@@ -154,17 +154,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _enumerator = _source.GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
@@ -223,17 +223,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _enumerator = _source.GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 
@@ -327,17 +327,17 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _enumerator = _source.GetEnumerator();
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (_enumerator.MoveNext())
                         {
-                            current = _enumerator.Current;
+                            _current = _enumerator.Current;
                             return true;
                         }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Union.cs

@@ -88,7 +88,7 @@ namespace System.Linq
                 var set = new Set<TSource>(_comparer);
                 var element = _enumerator.Current;
                 set.Add(element);
-                current = element;
+                _current = element;
                 _set = set;
             }
 
@@ -102,7 +102,7 @@ namespace System.Linq
                     var element = _enumerator.Current;
                     if (set.Add(element))
                     {
-                        current = element;
+                        _current = element;
                         return true;
                     }
                 }
@@ -112,7 +112,7 @@ namespace System.Linq
 
             protected sealed override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
                         _index = 0;
@@ -121,14 +121,14 @@ namespace System.Linq
                         {
                             ++_index;
 
-                            var enumerator = enumerable.GetAsyncEnumerator(cancellationToken);
+                            var enumerator = enumerable.GetAsyncEnumerator(_cancellationToken);
 
                             if (await enumerator.MoveNextAsync().ConfigureAwait(false))
                             {
                                 await SetEnumeratorAsync(enumerator).ConfigureAwait(false);
                                 StoreFirst();
 
-                                state = AsyncIteratorState.Iterating;
+                                _state = AsyncIteratorState.Iterating;
                                 return true;
                             }
                         }
@@ -149,7 +149,7 @@ namespace System.Linq
                                 break;
                             }
 
-                            await SetEnumeratorAsync(enumerable.GetAsyncEnumerator(cancellationToken)).ConfigureAwait(false);
+                            await SetEnumeratorAsync(enumerable.GetAsyncEnumerator(_cancellationToken)).ConfigureAwait(false);
                             ++_index;
                         }
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Where.cs

@@ -116,11 +116,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -129,7 +129,7 @@ namespace System.Linq
                             var item = _enumerator.Current;
                             if (_predicate(item))
                             {
-                                current = item;
+                                _current = item;
                                 return true;
                             }
                         }
@@ -177,12 +177,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -195,7 +195,7 @@ namespace System.Linq
                             var item = _enumerator.Current;
                             if (_predicate(item, _index))
                             {
-                                current = item;
+                                _current = item;
                                 return true;
                             }
                         }
@@ -246,11 +246,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -259,7 +259,7 @@ namespace System.Linq
                             var item = _enumerator.Current;
                             if (await _predicate(item).ConfigureAwait(false))
                             {
-                                current = item;
+                                _current = item;
                                 return true;
                             }
                         }
@@ -307,12 +307,12 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
                         _index = -1;
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -325,7 +325,7 @@ namespace System.Linq
                             var item = _enumerator.Current;
                             if (await _predicate(item, _index).ConfigureAwait(false))
                             {
-                                current = item;
+                                _current = item;
                                 return true;
                             }
                         }
@@ -380,11 +380,11 @@ namespace System.Linq
 
             protected override async ValueTask<bool> MoveNextCore()
             {
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _enumerator = _source.GetAsyncEnumerator(cancellationToken);
-                        state = AsyncIteratorState.Iterating;
+                        _enumerator = _source.GetAsyncEnumerator(_cancellationToken);
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
@@ -393,7 +393,7 @@ namespace System.Linq
                             var item = _enumerator.Current;
                             if (_predicate(item))
                             {
-                                current = _selector(item);
+                                _current = _selector(item);
                                 return true;
                             }
                         }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Zip.cs

@@ -83,19 +83,19 @@ namespace System.Linq
                 //         results in an unexpected source of concurrency. However, a concurrent Zip may be a worthy addition to the
                 //         API or System.Interactive.Async as a complementary implementation besides the conservative default.
 
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _firstEnumerator = _first.GetAsyncEnumerator(cancellationToken);
-                        _secondEnumerator = _second.GetAsyncEnumerator(cancellationToken);
+                        _firstEnumerator = _first.GetAsyncEnumerator(_cancellationToken);
+                        _secondEnumerator = _second.GetAsyncEnumerator(_cancellationToken);
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _firstEnumerator.MoveNextAsync().ConfigureAwait(false) && await _secondEnumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = _selector(_firstEnumerator.Current, _secondEnumerator.Current);
+                            _current = _selector(_firstEnumerator.Current, _secondEnumerator.Current);
                             return true;
                         }
 
@@ -155,19 +155,19 @@ namespace System.Linq
                 //         results in an unexpected source of concurrency. However, a concurrent Zip may be a worthy addition to the
                 //         API or System.Interactive.Async as a complementary implementation besides the conservative default.
 
-                switch (state)
+                switch (_state)
                 {
                     case AsyncIteratorState.Allocated:
-                        _firstEnumerator = _first.GetAsyncEnumerator(cancellationToken);
-                        _secondEnumerator = _second.GetAsyncEnumerator(cancellationToken);
+                        _firstEnumerator = _first.GetAsyncEnumerator(_cancellationToken);
+                        _secondEnumerator = _second.GetAsyncEnumerator(_cancellationToken);
 
-                        state = AsyncIteratorState.Iterating;
+                        _state = AsyncIteratorState.Iterating;
                         goto case AsyncIteratorState.Iterating;
 
                     case AsyncIteratorState.Iterating:
                         if (await _firstEnumerator.MoveNextAsync().ConfigureAwait(false) && await _secondEnumerator.MoveNextAsync().ConfigureAwait(false))
                         {
-                            current = await _selector(_firstEnumerator.Current, _secondEnumerator.Current).ConfigureAwait(false);
+                            _current = await _selector(_firstEnumerator.Current, _secondEnumerator.Current).ConfigureAwait(false);
                             return true;
                         }