Skip to content

Commit 024e2b9

Browse files
committed
Address code review feedback
1 parent 1f9b29d commit 024e2b9

File tree

1 file changed

+8
-8
lines changed
  • src/libraries/Microsoft.NETCore.Platforms/src

1 file changed

+8
-8
lines changed

src/libraries/Microsoft.NETCore.Platforms/src/RID.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private enum RIDPart : int
5151
{
5252
Base = 0,
5353
Version,
54-
Architcture,
54+
Architecture,
5555
Qualifier,
5656
Max = Qualifier
5757
}
@@ -91,24 +91,24 @@ public static RID Parse(string runtimeIdentifier)
9191
else if (current == ArchitectureDelimiter)
9292
{
9393
// ensure there's no version later in the string
94-
if (-1 != runtimeIdentifier.IndexOf(VersionDelimiter, i))
94+
if (runtimeIdentifier.IndexOf(VersionDelimiter, i) != -1)
9595
{
9696
break;
9797
}
9898
SetPart();
9999
partStart = i + 1; // skip delimiter
100-
parseState = RIDPart.Architcture;
100+
parseState = RIDPart.Architecture;
101101
}
102102
break;
103103
case RIDPart.Version:
104104
if (current == ArchitectureDelimiter)
105105
{
106106
SetPart();
107107
partStart = i + 1; // skip delimiter
108-
parseState = RIDPart.Architcture;
108+
parseState = RIDPart.Architecture;
109109
}
110110
break;
111-
case RIDPart.Architcture:
111+
case RIDPart.Architecture:
112112
if (current == QualifierDelimiter)
113113
{
114114
SetPart();
@@ -136,7 +136,7 @@ void SetPart()
136136
{
137137
if (partLength == 0)
138138
{
139-
throw new ArgumentException($"unexpected delimiter at position {partStart} in {runtimeIdentifier}");
139+
throw new ArgumentException($"Unexpected delimiter at position {partStart} in \"{runtimeIdentifier}\"");
140140
}
141141

142142
parts[(int)parseState] = runtimeIdentifier.Substring(partStart, partLength);
@@ -154,7 +154,7 @@ void SetPart()
154154
BaseRID = GetPart(RIDPart.Base),
155155
OmitVersionDelimiter = omitVersionDelimiter,
156156
Version = version == null ? null : new RuntimeVersion(version),
157-
Architecture = GetPart(RIDPart.Architcture),
157+
Architecture = GetPart(RIDPart.Architecture),
158158
Qualifier = GetPart(RIDPart.Qualifier)
159159
};
160160
}
@@ -173,7 +173,7 @@ public override bool Equals(object obj)
173173
public bool Equals(RID obj)
174174
{
175175
return object.ReferenceEquals(obj, this) ||
176-
(!(obj is null) &&
176+
(obj is not null &&
177177
BaseRID == obj.BaseRID &&
178178
(Version == null || OmitVersionDelimiter == obj.OmitVersionDelimiter) &&
179179
Version == obj.Version &&

0 commit comments

Comments
 (0)