R# Cleanup

Author: KrzysFR

FdbShell/Commands/BasicCommands.cs

@@ -73,7 +73,7 @@ public static async Task Dir(string[] path, IFdbTuple extras, DirectoryBrowseOpt
 							}
 							else
 							{
-								log.WriteLine("  {0,-12} {1,-12} {3,9:N0} {2}", FdbKey.Dump(subfolder.Copy().Key), subfolder.Layer.IsNullOrEmpty ? "-" : ("<" + subfolder.Layer.ToUnicode() + ">"), name, "-");
+								log.WriteLine("  {0,-12} {1,-12} {3,9} {2}", FdbKey.Dump(subfolder.Copy().Key), subfolder.Layer.IsNullOrEmpty ? "-" : ("<" + subfolder.Layer.ToUnicode() + ">"), name, "-");
 							}
 						}
 						else

FdbShell/Mono.Options/Options.cs

@@ -1081,7 +1081,7 @@ protected virtual bool Parse (string argument, OptionContext c)
 			if (ParseBool (argument, n, c))
 				return true;
 			// is it a bundled option?
-			if (ParseBundledValue (f, string.Concat (n + s + v), c))
+			if (ParseBundledValue (f, n + s + v, c))
 				return true;
 
 			return false;

FoundationDB.Client/Async/AsyncBuffer.cs

@@ -34,7 +34,6 @@ namespace FoundationDB.Async
 	using JetBrains.Annotations;
 	using System;
 	using System.Collections.Generic;
-	using System.Diagnostics;
 	using System.Runtime.ExceptionServices;
 	using System.Threading;
 	using System.Threading.Tasks;

FoundationDB.Client/Async/AsyncCancellableMutex.cs

@@ -73,7 +73,7 @@ private static void CancellationHandler(object state)
 
 			var weakRef = (WeakReference<AsyncCancelableMutex>)state;
 			AsyncCancelableMutex waiter;
-			if (weakRef.TryGetTarget(out waiter) && waiter != null)
+			if (weakRef.TryGetTarget(out waiter))
 			{ // still alive...
 				waiter.Abort(async: true);
 			}

FoundationDB.Client/Async/AsyncProducerConsumerQueue.cs

@@ -30,7 +30,6 @@ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
 
 namespace FoundationDB.Async
 {
-	using FoundationDB.Client.Utils;
 	using System;
 	using System.Diagnostics;
 	using System.Runtime.CompilerServices;

FoundationDB.Client/Async/AsyncPump.cs

@@ -30,7 +30,6 @@ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
 
 namespace FoundationDB.Async
 {
-	using FoundationDB.Client.Utils;
 	using JetBrains.Annotations;
 	using System;
 	using System.Diagnostics;

FoundationDB.Client/Async/AsyncTransform.cs

@@ -30,7 +30,6 @@ namespace FoundationDB.Async
 {
 	using JetBrains.Annotations;
 	using System;
-	using System.Diagnostics;
 	using System.Runtime.ExceptionServices;
 	using System.Threading;
 	using System.Threading.Tasks;

FoundationDB.Client/Async/Maybe.cs

@@ -122,6 +122,7 @@ public void ThrowForNonSuccess()
 				if (exception == null)
 				{
 					((ExceptionDispatchInfo)m_errorContainer).Throw();
+					return; // never reached, but helps with code analysis
 				}
 #endif
 				throw exception;

FoundationDB.Client/Async/TaskHelpers.cs

@@ -375,7 +375,7 @@ public static void PropagateException<T>([NotNull] TaskCompletionSource<T> tcs,
 			}
 			else if (e is AggregateException)
 			{
-				tcs.TrySetException((e as AggregateException).Flatten().InnerExceptions);
+				tcs.TrySetException(((AggregateException) e).Flatten().InnerExceptions);
 			}
 			else
 			{

FoundationDB.Client/Encoders/FdbEncoderSubspace`1.cs

@@ -28,7 +28,6 @@ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
 
 namespace FoundationDB.Client
 {
-	using FoundationDB.Client.Utils;
 	using FoundationDB.Layers.Tuples;
 	using JetBrains.Annotations;
 	using System;