diff --git a/src/TextTools/Format/FormatScanner.cs b/src/TextTools/Format/FormatScanner.cs index 5853d7f..0cc1a43 100644 --- a/src/TextTools/Format/FormatScanner.cs +++ b/src/TextTools/Format/FormatScanner.cs @@ -11,9 +11,9 @@ public FormatScanner(ReadOnlySpan format) _format = format; IsArgument = false; _index = 0; - Text = ReadOnlySpan.Empty; - ArgumentFormat = ReadOnlySpan.Empty; - ArgumentAlignment = ReadOnlySpan.Empty; + Text = []; + ArgumentFormat = []; + ArgumentAlignment = []; } public bool IsArgument { get; set; } @@ -26,9 +26,9 @@ public bool MoveNext() if (_index >= _format.Length) { IsArgument = false; - Text = ReadOnlySpan.Empty; - ArgumentFormat = ReadOnlySpan.Empty; - ArgumentAlignment = ReadOnlySpan.Empty; + Text = []; + ArgumentFormat = []; + ArgumentAlignment = []; return false; } @@ -46,7 +46,7 @@ public bool MoveNext() static int ArgumentFormatLength(ReadOnlySpan source) { - ReadOnlySpan braces = stackalloc char[] { '{', '}' }; + ReadOnlySpan braces = ['{', '}']; var result = 0; while (true) @@ -80,7 +80,7 @@ static int ArgumentFormatLength(ReadOnlySpan source) bool MoveNextText() { var remaining = _format.Slice(_index); - var i = remaining.IndexOfAny(stackalloc char[] { '{', '}' }); + var i = remaining.IndexOfAny(['{', '}']); if (i < 0) { @@ -106,7 +106,7 @@ bool MoveNextText() bool MoveNextArgument() { var remaining = _format.Slice(_index); - var i = remaining.IndexOfAny(stackalloc char[] { ',', ':', '}' }); + var i = remaining.IndexOfAny([',', ':', '}']); if (i < 0) { @@ -123,7 +123,7 @@ bool MoveNextArgument() if (c == ',') { remaining = remaining.Slice(i + 1); - i = remaining.IndexOfAny(stackalloc char[] { ':', '}' }); + i = remaining.IndexOfAny([':', '}']); if (i < 0) { @@ -136,7 +136,7 @@ bool MoveNextArgument() } else { - alignment = ReadOnlySpan.Empty; + alignment = []; } ReadOnlySpan format; @@ -156,7 +156,7 @@ bool MoveNextArgument() } else { - format = ReadOnlySpan.Empty; + format = []; } SetArgument(arg, format, alignment); @@ -167,8 +167,8 @@ void SetText(ReadOnlySpan text) { Text = text; IsArgument = false; - ArgumentFormat = ReadOnlySpan.Empty; - ArgumentAlignment = ReadOnlySpan.Empty; + ArgumentFormat = []; + ArgumentAlignment = []; } void SetArgument(ReadOnlySpan arg, ReadOnlySpan format, ReadOnlySpan alignment) diff --git a/src/TextTools/Format/FormatString.cs b/src/TextTools/Format/FormatString.cs index 75d2807..d557623 100644 --- a/src/TextTools/Format/FormatString.cs +++ b/src/TextTools/Format/FormatString.cs @@ -13,7 +13,7 @@ public static class FormatString public static bool ContainsEscapes(ReadOnlySpan formatString, out int unescapedLength) { unescapedLength = formatString.Length; - ReadOnlySpan braces = stackalloc char[] { '{', '}' }; + ReadOnlySpan braces = ['{', '}']; var i = formatString.IndexOfAny(braces); @@ -40,7 +40,7 @@ public static bool ContainsEscapes(ReadOnlySpan formatString, out int unes public static int WriteUnescaped(ReadOnlySpan formatString, Span unescaped) { - ReadOnlySpan braces = stackalloc char[] { '{', '}' }; + ReadOnlySpan braces = ['{', '}']; var i = formatString.IndexOfAny(braces); var length = 0; diff --git a/src/TextTools/StringPool/StringPool.cs b/src/TextTools/StringPool/StringPool.cs index 3291c6f..f6e2b27 100644 --- a/src/TextTools/StringPool/StringPool.cs +++ b/src/TextTools/StringPool/StringPool.cs @@ -94,7 +94,7 @@ public string GetString(ReadOnlySpan text) return result; } - public StringPool Clone() => new StringPool(this); + public StringPool Clone() => new(this); object ICloneable.Clone() => Clone();