Simplify CheckIsReserved in IriHelper (dotnet#32340)

* Simplify CheckIsReserved in IriHelper * Simplify CheckIsReserved further
kunalspathak · Feb 18, 2020 · 106eebd · 106eebd
1 parent b00f349
commit 106eebd
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/libraries/System.Private.Uri/src/System/IriHelper.cs b/src/libraries/System.Private.Uri/src/System/IriHelper.cs
@@ -53,19 +53,12 @@ internal static bool CheckIriUnicodeRange(char highSurr, char lowSurr, out bool
         //
         internal static bool CheckIsReserved(char ch, UriComponents component)
         {
-            if ((component != UriComponents.Scheme) &&
-                    (component != UriComponents.UserInfo) &&
-                    (component != UriComponents.Host) &&
-                    (component != UriComponents.Port) &&
-                    (component != UriComponents.Path) &&
-                    (component != UriComponents.Query) &&
-                    (component != UriComponents.Fragment)
-                )
+            if ((UriComponents.AbsoluteUri & component) == 0)
             {
-                return (component == (UriComponents)0) ? UriHelper.IsGenDelim(ch) : false;
+                return component == 0 && UriHelper.IsGenDelim(ch);
             }
 
-            return UriHelper.RFC3986ReservedMarks.IndexOf(ch) >= 0;
+            return UriHelper.RFC3986ReservedMarks.Contains(ch);
         }
 
         //