Remove some branches

gfoidl · May 29, 2021 · da1027e · da1027e
1 parent 1a76e22
commit da1027e
Showing 1 changed file with 5 additions and 21 deletions.
diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs b/src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs
@@ -76,28 +76,12 @@ public StringSegment(string buffer, int offset, int length)
         /// <summary>
         /// Gets the value of this segment as a <see cref="string"/>.
         /// </summary>
-        public string Value
-        {
-            get
-            {
-                if (HasValue)
-                {
-                    return Buffer.Substring(Offset, Length);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
+        public string Value => HasValue ? Buffer.Substring(Offset, Length) : null;
 
         /// <summary>
         /// Gets whether this <see cref="StringSegment"/> contains a valid value.
         /// </summary>
-        public bool HasValue
-        {
-            get { return Buffer != null; }
-        }
+        public bool HasValue => Buffer != null;
 
         /// <summary>
         /// Gets the <see cref="char"/> at a specified position in the current <see cref="StringSegment"/>.
@@ -152,7 +136,7 @@ public char this[int index]
         /// </exception>
         public ReadOnlySpan<char> AsSpan(int start, int length)
         {
-            if (!HasValue || start < 0 || length < 0 || (uint)(start + length) > (uint)Length)
+            if (!HasValue || (start | length) < 0 || (uint)(start + length) > (uint)Length)
             {
                 ThrowInvalidArguments(start, length, offsetIsStart: true);
             }
@@ -404,7 +388,7 @@ public bool EndsWith(string text, StringComparison comparisonType)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public string Substring(int offset, int length)
         {
-            if (!HasValue || offset < 0 || length < 0 || (uint)(offset + length) > (uint)Length)
+            if (!HasValue || (offset | length) < 0 || (uint)(offset + length) > (uint)Length)
             {
                 ThrowInvalidArguments(offset, length);
             }
@@ -437,7 +421,7 @@ public string Substring(int offset, int length)
         /// </exception>
         public StringSegment Subsegment(int offset, int length)
         {
-            if (!HasValue || offset < 0 || length < 0 || (uint)(offset + length) > (uint)Length)
+            if (!HasValue || (offset | length) < 0 || (uint)(offset + length) > (uint)Length)
             {
                 ThrowInvalidArguments(offset, length);
             }