Code cleanup

Author: Krusen

BencodeNET/IO/BencodeStream.cs

@@ -75,7 +75,7 @@ public BencodeStream(Stream stream, bool leaveOpen = false)
         /// </summary>
         public long Position
         {
-            get { return InnerStream.Position; }
+            get => InnerStream.Position;
             set
             {
                 _hasPeeked = false;

BencodeNET/Objects/BString.cs

@@ -39,8 +39,8 @@ public class BString : BObject<IReadOnlyList<byte>>, IComparable<BString>
         /// <exception cref="ArgumentNullException"></exception>
         public Encoding Encoding
         {
-            get { return _encoding; }
-            set { _encoding = value ?? DefaultEncoding; }
+            get => _encoding;
+            set => _encoding = value ?? DefaultEncoding;
         }
         private Encoding _encoding;
 
@@ -111,8 +111,7 @@ public static implicit operator BString(string value)
 
         public override bool Equals(object other)
         {
-            var bstring = other as BString;
-            if (bstring != null)
+            if (other is BString bstring)
                 return Value.SequenceEqual(bstring.Value);
 
             return false;

BencodeNET/Parsing/BObjectParserList.cs

@@ -60,6 +60,7 @@ public void AddOrReplace(Type type, IBObjectParser parser)
 
             if (Parsers.ContainsKey(type))
                 Parsers.Remove(type);
+
             Parsers.Add(type, parser);
         }
 
@@ -105,8 +106,8 @@ public IBObjectParser Get(Type type)
         /// <returns>The parser for the specified type or null if there isn't one.</returns>
         public IBObjectParser this[Type type]
         {
-            get { return Get(type); }
-            set { AddOrReplace(type, value); }
+            get => Get(type);
+            set => AddOrReplace(type, value);
         }
 
         /// <summary>

BencodeNET/Parsing/TorrentParser.cs

@@ -185,7 +185,7 @@ protected virtual SingleFileInfo ParseSingleFileInfo(BDictionary info, Encoding
             if (!info.ContainsKey(TorrentInfoFields.Length))
                 return null;
 
-                return new SingleFileInfo
+            return new SingleFileInfo
             {
                 FileName = info.Get<BString>(TorrentInfoFields.Name)?.ToString(encoding),
                 FileSize = info.Get<BNumber>(TorrentInfoFields.Length),
@@ -278,22 +278,14 @@ private BDictionary ParseExtraInfoFields(BDictionary info)
         // TODO: Unit tests
         private void FixEncoding(IBObject bobject, Encoding encoding)
         {
-            var dictionary = bobject as BDictionary;
-            if (dictionary != null)
+            switch (bobject)
             {
-                FixEncodingInDictionary(dictionary, encoding);
-            }
-
-            var list = bobject as BList;
-            if (list != null)
-            {
-                FixEncodingInList(list, encoding);
-            }
-
-            var value = bobject as BString;
-            if (value != null)
-            {
-                value.Encoding = encoding;
+                case BDictionary dictionary:
+                    FixEncodingInDictionary(dictionary, encoding); break;
+                case BList list:
+                    FixEncodingInList(list, encoding); break;
+                case BString str:
+                    str.Encoding = encoding; break;
             }
         }
 

BencodeNET/Torrents/MultiFileInfo.cs

@@ -41,14 +41,8 @@ public class MultiFileInfo
         /// </summary>
         public string FullPath
         {
-            get
-            {
-                return string.Join(System.IO.Path.DirectorySeparatorChar.ToString(), Path);
-            }
-            set
-            {
-                Path = value.Split(new[] { System.IO.Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries);
-            }
+            get => string.Join(System.IO.Path.DirectorySeparatorChar.ToString(), Path);
+            set => Path = value.Split(new[] { System.IO.Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries);
         }
     }
 }

BencodeNET/Torrents/Torrent.cs

@@ -169,10 +169,7 @@ public virtual string DisplayName
         /// </summary>
         public virtual string PiecesAsHexString
         {
-            get
-            {
-                return BitConverter.ToString(Pieces).Replace("-", "");
-            }
+            get => BitConverter.ToString(Pieces).Replace("-", "");
             set
             {
                 if (value?.Length % 40 != 0)

BencodeNET/UtilityExtensions.cs

@@ -14,7 +14,7 @@ internal static class UtilityExtensions
     {
         public static bool IsDigit(this char c)
         {
-            return (c >= '0' && c <= '9');
+            return c >= '0' && c <= '9';
         }
 
         public static MemoryStream AsStream(this string str, Encoding encoding)
@@ -24,10 +24,7 @@ public static MemoryStream AsStream(this string str, Encoding encoding)
 
         public static TValue GetValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)
         {
-            TValue value;
-            if (dictionary.TryGetValue(key, out value))
-                return value;
-            return default(TValue);
+            return dictionary.TryGetValue(key, out TValue value) ? value : default(TValue);
         }
 
         public static void Write(this Stream stream, char c)