Skip to content

re use slice #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2023
Merged

re use slice #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44432db
re use slice
SimonCropp Dec 15, 2023
8963319
Update Utf8StringWriter.cs
SimonCropp Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/Utf8StringInterpolation/Shims.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static bool TryFormat(this char value, Span<byte> utf8Destination, out in
}
#endif
}

#if !NET8_0_OR_GREATER
public static bool TryFormat(this DateTime value, Span<byte> utf8Destination, out int bytesWritten, string? format, IFormatProvider? formatProvider)
{
Expand All @@ -46,14 +46,15 @@ public static bool TryFormat(this DateTime value, Span<byte> utf8Destination, ou
}
}

var count = Encoding.UTF8.GetByteCount(charDest.Slice(0, charWritten));
var slice = charDest.Slice(0, charWritten);
var count = Encoding.UTF8.GetByteCount(slice);
if (utf8Destination.Length < count)
{
bytesWritten = 0;
return false;
}

bytesWritten = Encoding.UTF8.GetBytes(charDest.Slice(0, charWritten), utf8Destination);
bytesWritten = Encoding.UTF8.GetBytes(slice, utf8Destination);
return true;
}

Expand All @@ -73,14 +74,15 @@ public static bool TryFormat(this DateTimeOffset value, Span<byte> utf8Destinati
}
}

var count = Encoding.UTF8.GetByteCount(charDest.Slice(0, charWritten));
var slice = charDest.Slice(0, charWritten);
var count = Encoding.UTF8.GetByteCount(slice);
if (utf8Destination.Length < count)
{
bytesWritten = 0;
return false;
}

bytesWritten = Encoding.UTF8.GetBytes(charDest.Slice(0, charWritten), utf8Destination);
bytesWritten = Encoding.UTF8.GetBytes(slice, utf8Destination);
return true;
}

Expand All @@ -100,14 +102,15 @@ public static bool TryFormat(this TimeSpan value, Span<byte> utf8Destination, ou
}
}

var count = Encoding.UTF8.GetByteCount(charDest.Slice(0, charWritten));
var slice = charDest.Slice(0, charWritten);
var count = Encoding.UTF8.GetByteCount(slice);
if (utf8Destination.Length < count)
{
bytesWritten = 0;
return false;
}

bytesWritten = Encoding.UTF8.GetBytes(charDest.Slice(0, charWritten), utf8Destination);
bytesWritten = Encoding.UTF8.GetBytes(slice, utf8Destination);
return true;
}
#endif
Expand Down
5 changes: 3 additions & 2 deletions src/Utf8StringInterpolation/Utf8StringWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,10 @@ int AppendSpanFormattable<T>(T value, string? format)
}
}

var count = Encoding.UTF8.GetByteCount(charDest.Slice(0, charWritten));
var slice = charDest.Slice(0, charWritten);
var count = Encoding.UTF8.GetByteCount(slice);
TryGrow(count);
var bytesWritten = Encoding.UTF8.GetBytes(charDest.Slice(0, charWritten), destination);
var bytesWritten = Encoding.UTF8.GetBytes(slice, destination);
destination = destination.Slice(bytesWritten);
currentWritten += bytesWritten;
return bytesWritten;
Expand Down