mirror of
https://github.com/Thealexbarney/LibHac.git
synced 2024-11-14 10:49:41 +01:00
Make sure modifiers are all in a consistent order
This commit is contained in:
parent
e3d55f6793
commit
3c6d082ad4
6 changed files with 17 additions and 17 deletions
|
@ -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();
|
||||
}
|
|
@ -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
|
||||
|
|
|
@ -28,7 +28,7 @@ public struct AesKey
|
|||
|
||||
public static implicit operator ReadOnlySpan<byte>(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<byte>(in AesIv value) => Unsafe.AsRef(in value).Data;
|
||||
public static implicit operator ReadOnlySpan<byte>(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<byte>(in AesCmac value) => Unsafe.AsRef(in value).Data;
|
||||
public static implicit operator ReadOnlySpan<byte>(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;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -68,7 +68,7 @@ public struct SaveDataAttribute : IEquatable<SaveDataAttribute>, IComparable<Sav
|
|||
return Result.Success;
|
||||
}
|
||||
|
||||
public override readonly bool Equals(object obj)
|
||||
public readonly override bool Equals(object obj)
|
||||
{
|
||||
return obj is SaveDataAttribute attribute && Equals(attribute);
|
||||
}
|
||||
|
@ -86,7 +86,7 @@ public struct SaveDataAttribute : IEquatable<SaveDataAttribute>, IComparable<Sav
|
|||
public static bool operator ==(SaveDataAttribute left, SaveDataAttribute right) => 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);
|
||||
|
|
|
@ -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);
|
||||
}
|
Loading…
Reference in a new issue