Browse Source

Misc. cosmetic changes.

Bart De Smet 8 years ago
parent
commit
384e5f8c32

+ 2 - 8
Rx.NET/Source/src/System.Reactive/Linq/Observable/GetEnumerator.cs

@@ -75,15 +75,9 @@ namespace System.Reactive.Linq.ObservableImpl
             return false;
         }
 
-        public TSource Current
-        {
-            get { return _current; }
-        }
+        public TSource Current => _current;
 
-        object Collections.IEnumerator.Current
-        {
-            get { return _current; }
-        }
+        object Collections.IEnumerator.Current => _current;
 
         public void Dispose()
         {

+ 4 - 10
Rx.NET/Source/src/System.Reactive/Linq/Observable/PushToPullAdapter.cs

@@ -8,7 +8,7 @@ using System.Reactive.Disposables;
 
 namespace System.Reactive.Linq.ObservableImpl
 {
-    abstract class PushToPullAdapter<TSource, TResult> : IEnumerable<TResult>
+    internal abstract class PushToPullAdapter<TSource, TResult> : IEnumerable<TResult>
     {
         private readonly IObservable<TSource> _source;
 
@@ -17,10 +17,7 @@ namespace System.Reactive.Linq.ObservableImpl
             _source = source;
         }
 
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
         public IEnumerator<TResult> GetEnumerator()
         {
@@ -33,7 +30,7 @@ namespace System.Reactive.Linq.ObservableImpl
         protected abstract PushToPullSink<TSource, TResult> Run(IDisposable subscription);
     }
 
-    abstract class PushToPullSink<TSource, TResult> : IObserver<TSource>, IEnumerator<TResult>, IDisposable
+    internal abstract class PushToPullSink<TSource, TResult> : IObserver<TSource>, IEnumerator<TResult>, IDisposable
     {
         private readonly IDisposable _subscription;
 
@@ -76,10 +73,7 @@ namespace System.Reactive.Linq.ObservableImpl
             private set;
         }
 
-        object IEnumerator.Current
-        {
-            get { return Current; }
-        }
+        object IEnumerator.Current => Current;
 
         public void Reset()
         {