From 3c6d082ad4fc9738eb6474bd23673a441770cd1b Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Sat, 18 Dec 2021 19:28:15 -0700 Subject: [PATCH] Make sure modifiers are all in a consistent order --- src/LibHac/Boot/KeyBlob.cs | 6 +++--- src/LibHac/Common/U8StringBuilder.cs | 4 ++-- src/LibHac/Crypto/KeyTypes.cs | 10 +++++----- src/LibHac/Fs/Common/Path.cs | 4 ++-- src/LibHac/Fs/SaveDataStructs.cs | 6 +++--- src/LibHac/Lr/Path.cs | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/LibHac/Boot/KeyBlob.cs b/src/LibHac/Boot/KeyBlob.cs index a5d22911..dffa95e9 100644 --- a/src/LibHac/Boot/KeyBlob.cs +++ b/src/LibHac/Boot/KeyBlob.cs @@ -49,7 +49,7 @@ public struct EncryptedKeyBlob return SpanHelpers.AsReadOnlyByteSpan(in value); } - public override readonly string ToString() => ReadOnlyBytes.ToHexString(); + public readonly override string ToString() => ReadOnlyBytes.ToHexString(); } [DebuggerDisplay("{ToString()}")] @@ -89,5 +89,5 @@ public struct KeyBlob return SpanHelpers.AsReadOnlyByteSpan(in value); } - public override readonly string ToString() => ReadOnlyBytes.ToHexString(); -} + public readonly override string ToString() => ReadOnlyBytes.ToHexString(); +} \ No newline at end of file diff --git a/src/LibHac/Common/U8StringBuilder.cs b/src/LibHac/Common/U8StringBuilder.cs index 7046a651..300afa94 100644 --- a/src/LibHac/Common/U8StringBuilder.cs +++ b/src/LibHac/Common/U8StringBuilder.cs @@ -439,7 +439,7 @@ public ref struct U8StringBuilder } } - public override readonly string ToString() => StringUtils.Utf8ZToString(Buffer); + public readonly override string ToString() => StringUtils.Utf8ZToString(Buffer); } public static class U8StringBuilderExtensions @@ -565,4 +565,4 @@ public static class U8StringBuilderExtensions sb.PadRightInternal(paddingCharacter, paddedLength); return ref sb; } -} +} \ No newline at end of file diff --git a/src/LibHac/Crypto/KeyTypes.cs b/src/LibHac/Crypto/KeyTypes.cs index 2d13db38..083d53e8 100644 --- a/src/LibHac/Crypto/KeyTypes.cs +++ b/src/LibHac/Crypto/KeyTypes.cs @@ -28,7 +28,7 @@ public struct AesKey public static implicit operator ReadOnlySpan(in AesKey value) => value.DataRo; - public override readonly string ToString() => DataRo.ToHexString(); + public readonly override string ToString() => DataRo.ToHexString(); #if DEBUG [FieldOffset(8)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly ulong _dummy1; @@ -60,7 +60,7 @@ public struct AesXtsKey [MethodImpl(MethodImplOptions.AggressiveInlining)] public readonly bool IsZeros() => (DataRo64[0] | DataRo64[1] | DataRo64[2] | DataRo64[3]) == 0; - public override readonly string ToString() => DataRo.ToHexString(); + public readonly override string ToString() => DataRo.ToHexString(); } [DebuggerDisplay("{ToString()}")] @@ -83,7 +83,7 @@ public struct AesIv public static implicit operator Span(in AesIv value) => Unsafe.AsRef(in value).Data; public static implicit operator ReadOnlySpan(in AesIv value) => value.DataRo; - public override readonly string ToString() => DataRo.ToHexString(); + public readonly override string ToString() => DataRo.ToHexString(); #if DEBUG [FieldOffset(8)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly ulong _dummy1; @@ -110,7 +110,7 @@ public struct AesCmac public static implicit operator Span(in AesCmac value) => Unsafe.AsRef(in value).Data; public static implicit operator ReadOnlySpan(in AesCmac value) => value.DataRo; - public override readonly string ToString() => DataRo.ToHexString(); + public readonly override string ToString() => DataRo.ToHexString(); #if DEBUG [FieldOffset(8)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly ulong _dummy1; @@ -162,4 +162,4 @@ public struct Data3 public Span Data => SpanHelpers.CreateSpan(ref _byte, 3); public readonly ReadOnlySpan DataRo => SpanHelpers.CreateReadOnlySpan(in _byte, 3); -} +} \ No newline at end of file diff --git a/src/LibHac/Fs/Common/Path.cs b/src/LibHac/Fs/Common/Path.cs index f3acb9bc..3fa70880 100644 --- a/src/LibHac/Fs/Common/Path.cs +++ b/src/LibHac/Fs/Common/Path.cs @@ -1085,7 +1085,7 @@ public ref struct Path } } - public override readonly string ToString() => StringUtils.Utf8ZToString(_string); + public readonly override string ToString() => StringUtils.Utf8ZToString(_string); public override bool Equals(object obj) => throw new NotSupportedException(); public override int GetHashCode() => throw new NotImplementedException(); @@ -1230,4 +1230,4 @@ public static class PathFunctions return SetUpFixedPath(ref path, pathBuffer); } -} +} \ No newline at end of file diff --git a/src/LibHac/Fs/SaveDataStructs.cs b/src/LibHac/Fs/SaveDataStructs.cs index 27412a93..09f39c14 100644 --- a/src/LibHac/Fs/SaveDataStructs.cs +++ b/src/LibHac/Fs/SaveDataStructs.cs @@ -68,7 +68,7 @@ public struct SaveDataAttribute : IEquatable, IComparable, IComparable left.Equals(right); public static bool operator !=(SaveDataAttribute left, SaveDataAttribute right) => !(left == right); - public override readonly int GetHashCode() + public readonly override int GetHashCode() { // ReSharper disable NonReadonlyMemberInGetHashCode return HashCode.Combine(ProgramId, Type, UserId, StaticSaveDataId, Rank, Index); @@ -339,4 +339,4 @@ internal static class SaveDataTypesValidity { return (uint)metaType <= (uint)SaveDataMetaType.ExtensionContext; } -} +} \ No newline at end of file diff --git a/src/LibHac/Lr/Path.cs b/src/LibHac/Lr/Path.cs index bbb30172..495f8be3 100644 --- a/src/LibHac/Lr/Path.cs +++ b/src/LibHac/Lr/Path.cs @@ -31,5 +31,5 @@ public struct Path [MethodImpl(MethodImplOptions.AggressiveInlining)] public static implicit operator U8Span(in Path value) => new U8Span(SpanHelpers.AsReadOnlyByteSpan(in value)); - public override readonly string ToString() => StringUtils.Utf8ZToString(Str); -} + public readonly override string ToString() => StringUtils.Utf8ZToString(Str); +} \ No newline at end of file