Skip to content

Commit

Permalink
Merge branch 'main' into frozen
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Jan 8, 2024
2 parents 1afe5eb + 8cb0a1c commit 127ea00
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/Argon/JsonPosition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ internal static string FormatMessage(IJsonLineInfo? lineInfo, string path, strin

if (!message.EndsWith('.'))
{
message += ".";
message += '.';
}

message += " ";
message += ' ';
}

message += $"Path '{path}'";
Expand All @@ -112,7 +112,7 @@ internal static string FormatMessage(IJsonLineInfo? lineInfo, string path, strin
message += $", line {lineInfo.LineNumber}, position {lineInfo.LinePosition}";
}

message += ".";
message += '.';

return message;
}
Expand Down
5 changes: 3 additions & 2 deletions src/Argon/Utilities/ConvertUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ public static TimeSpan ParseTimeSpan(string input) =>
{
var initialType = t.Item1;
var targetType = t.Item2;
var castMethodInfo = targetType.GetMethod("op_Implicit", [initialType])
?? targetType.GetMethod("op_Explicit", [initialType]);
Type[] types = [initialType];
var castMethodInfo = targetType.GetMethod("op_Implicit", types)
?? targetType.GetMethod("op_Explicit", types);

if (castMethodInfo == null)
{
Expand Down

0 comments on commit 127ea00

Please sign in to comment.