Use file-scoped namespaces

DotnetCliVersion.txt

@@ -1 +1 @@
-5.0.402
+6.0.100

build/Build.cs

@@ -22,8 +22,8 @@ using static Nuke.Common.IO.FileSystemTasks;
 using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 
-namespace LibHacBuild
+namespace LibHacBuild;
-{
+
 partial class Build : NukeBuild
 {
     public static int Main() => Execute<Build>(x => x.Standard);
@@ -705,4 +705,3 @@ namespace LibHacBuild
         }
     }
 }
-}

build/CodeGen/Common.cs

@@ -5,8 +5,8 @@ using System.Reflection;
 using System.Text;
 using Nuke.Common;
 
-namespace LibHacBuild.CodeGen
+namespace LibHacBuild.CodeGen;
-{
+
 public static class Common
 {
     public static string GetHeader()
@@ -106,4 +106,3 @@ namespace LibHacBuild.CodeGen
         return Path.Combine(currentDir, "src");
     }
 }
-}

build/CodeGen/IndentingStringBuilder.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Text;
 
-namespace LibHacBuild.CodeGen
+namespace LibHacBuild.CodeGen;
-{
+
 public class IndentingStringBuilder
 {
     public int LevelSize { get; set; } = 4;
@@ -86,4 +86,3 @@ namespace LibHacBuild.CodeGen
 
     public override string ToString() => _sb.ToString();
 }
-}

build/CodeGen/Stage1/ResultCodegen.cs

@@ -11,8 +11,8 @@ using CsvHelper;
 using CsvHelper.Configuration;
 using static LibHacBuild.CodeGen.Common;
 
-namespace LibHacBuild.CodeGen.Stage1
+namespace LibHacBuild.CodeGen.Stage1;
-{
+
 public static class ResultCodeGen
 {
     // RyuJIT will always be inlined a function if its CIL size is <= 0x10 bytes
@@ -712,4 +712,3 @@ namespace LibHacBuild.CodeGen.Stage1
         });
     }
 }
-}

build/CodeGen/Stage2/KeysCodeGen.cs

@@ -8,8 +8,8 @@ using LibHac.Common.Keys;
 using LibHac.Crypto;
 using static LibHacBuild.CodeGen.Common;
 
-namespace LibHacBuild.CodeGen.Stage2
+namespace LibHacBuild.CodeGen.Stage2;
-{
+
 public static class KeysCodeGen
 {
     private static string InputMainKeyFileName = "IncludedKeys.txt";
@@ -390,4 +390,3 @@ namespace LibHacBuild.CodeGen.Stage2
         0x71, 0xB0, 0x5C, 0xF4, 0xAD, 0x63, 0x4F, 0xC5, 0xE2, 0xAC, 0x1E, 0xC4, 0x33, 0x96, 0x09, 0x7B
     };
 }
-}

build/CodeGen/Stage2/RunStage2.cs

@@ -2,8 +2,8 @@
 using System.IO;
 using Octokit;
 
-namespace LibHacBuild.CodeGen.Stage2
+namespace LibHacBuild.CodeGen.Stage2;
-{
+
 // Some codegen depends on classes in LibHac.
 // The part that does is split out into a separate project so the main build project
 // doesn't depend on LibHac.
@@ -23,4 +23,3 @@ namespace LibHacBuild.CodeGen.Stage2
         return 0;
     }
 }
-}

build/CodeGen/_buildCodeGen.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <LangVersion>10.0</LangVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace>LibHacBuild.CodeGen</RootNamespace>
     <IsPackable>False</IsPackable>

build/RepackNuget.cs

@@ -11,8 +11,8 @@ using Nuke.Common.IO;
 using Nuke.Common.Tools.NuGet;
 using static Nuke.Common.IO.FileSystemTasks;
 
-namespace LibHacBuild
+namespace LibHacBuild;
-{
+
 public partial class Build
 {
     public void RepackNugetPackage(string path)
@@ -133,4 +133,3 @@ namespace LibHacBuild
         return BitConverter.ToString(arr).ToLower().Replace("-", "");
     }
 }
-}

build/_build.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <LangVersion>10.0</LangVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace>LibHacBuild</RootNamespace>
     <IsPackable>False</IsPackable>

src/LibHac/Account/Uid.cs

@@ -3,8 +3,8 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using LibHac.Common;
 
-namespace LibHac.Account
+namespace LibHac.Account;
-{
+
 [DebuggerDisplay("0x{ToString(),nq}")]
 [StructLayout(LayoutKind.Sequential, Size = 0x10)]
 public struct Uid : IEquatable<Uid>, IComparable<Uid>, IComparable
@@ -56,4 +56,3 @@ namespace LibHac.Account
     public static bool operator <=(Uid left, Uid right) => left.CompareTo(right) <= 0;
     public static bool operator >=(Uid left, Uid right) => left.CompareTo(right) >= 0;
 }
-}

src/LibHac/ApplicationId.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace LibHac
+namespace LibHac;
-{
+
 public readonly struct ApplicationId : IEquatable<ApplicationId>
 {
     public static ApplicationId InvalidId => default;
@@ -20,4 +20,3 @@ namespace LibHac
     public bool Equals(ApplicationId other) => Value == other.Value;
     public override int GetHashCode() => HashCode.Combine(Value);
 }
-}

src/LibHac/Arp/ApplicationLaunchProperty.cs

@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
-namespace LibHac.Arp
+namespace LibHac.Arp;
-{
+
 [StructLayout(LayoutKind.Explicit, Size = 0x10)]
 public struct ApplicationLaunchProperty
 {
@@ -10,4 +10,3 @@ namespace LibHac.Arp
     [FieldOffset(0xC)] public Ncm.StorageId BaseStorageId;
     [FieldOffset(0xD)] public Ncm.StorageId UpdateStorageId;
 }
-}

src/LibHac/Arp/ArpClient.cs

@@ -3,8 +3,8 @@ using LibHac.Arp.Impl;
 using LibHac.Common;
 using LibHac.Ns;
 
-namespace LibHac.Arp
+namespace LibHac.Arp;
-{
+
 public class ArpClient : IDisposable
 {
     private HorizonClient _hosClient;
@@ -72,4 +72,3 @@ namespace LibHac.Arp
         }
     }
 }
-}

src/LibHac/Arp/Impl/IReader.cs

@@ -1,8 +1,8 @@
 using System;
 using LibHac.Ns;
 
-namespace LibHac.Arp.Impl
+namespace LibHac.Arp.Impl;
-{
+
 public interface IReader : IDisposable
 {
     Result GetApplicationLaunchProperty(out ApplicationLaunchProperty launchProperty, ulong processId);
@@ -10,4 +10,3 @@ namespace LibHac.Arp.Impl
     Result GetApplicationControlProperty(out ApplicationControlProperty controlProperty, ulong processId);
     Result GetApplicationControlPropertyWithApplicationId(out ApplicationControlProperty controlProperty, ApplicationId applicationId);
 }
-}

src/LibHac/Bcat/BcatServer.cs

@@ -5,8 +5,8 @@ using LibHac.Bcat.Impl.Service.Core;
 using LibHac.Common;
 using LibHac.Fs;
 
-namespace LibHac.Bcat
+namespace LibHac.Bcat;
-{
+
 public class BcatServer
 {
     private const int ServiceTypeCount = 4;
@@ -87,4 +87,3 @@ namespace LibHac.Bcat
         }
     }
 }
-}

src/LibHac/Bcat/BcatServiceType.cs

@@ -1,5 +1,5 @@
-namespace LibHac.Bcat
+namespace LibHac.Bcat;
-{
+
 public enum BcatServiceType
 {
     BcatU,
@@ -7,4 +7,3 @@
     BcatM,
     BcatA
 }
-}

src/LibHac/Bcat/DeliveryCacheDirectoryEntry.cs

@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
-namespace LibHac.Bcat
+namespace LibHac.Bcat;
-{
+
 [StructLayout(LayoutKind.Explicit, Size = 0x38)]
 public struct DeliveryCacheDirectoryEntry
 {
@@ -16,4 +16,3 @@ namespace LibHac.Bcat
         Digest = digest;
     }
 }
-}

src/LibHac/Bcat/Digest.cs

@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 using LibHac.Common;
 using LibHac.Util;
 
-namespace LibHac.Bcat
+namespace LibHac.Bcat;
-{
+
 [DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = 16)]
 public struct Digest
@@ -26,4 +26,3 @@ namespace LibHac.Bcat
         return Bytes.ToHexString();
     }
 }
-}

src/LibHac/Bcat/DirectoryName.cs

@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 using LibHac.Common;
 using LibHac.Util;
 
-namespace LibHac.Bcat
+namespace LibHac.Bcat;
-{
+
 [DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = MaxSize)]
 public struct DirectoryName
@@ -50,4 +50,3 @@ namespace LibHac.Bcat
         return StringUtils.Utf8ZToString(Bytes);
     }
 }
-}

src/LibHac/Bcat/FileName.cs

@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 using LibHac.Common;
 using LibHac.Util;
 
-namespace LibHac.Bcat
+namespace LibHac.Bcat;
-{
+
 [DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = MaxSize)]
 public struct FileName
@@ -53,4 +53,3 @@ namespace LibHac.Bcat
         return StringUtils.Utf8ZToString(Bytes);
     }
 }
-}

src/LibHac/Bcat/Impl/Ipc/BcatServiceObject.cs

@@ -2,8 +2,8 @@
 using LibHac.Common;
 using LibHac.Sm;
 
-namespace LibHac.Bcat.Impl.Ipc
+namespace LibHac.Bcat.Impl.Ipc;
-{
+
 internal class BcatServiceObject : IServiceObject
 {
     private SharedRef<IServiceCreator> _serviceCreator;
@@ -24,4 +24,3 @@ namespace LibHac.Bcat.Impl.Ipc
         return Result.Success;
     }
 }
-}

src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheDirectoryService.cs

@@ -1,11 +1,10 @@
 using System;
 
-namespace LibHac.Bcat.Impl.Ipc
+namespace LibHac.Bcat.Impl.Ipc;
-{
+
 public interface IDeliveryCacheDirectoryService : IDisposable
 {
     Result Open(ref DirectoryName name);
     Result Read(out int entriesRead, Span<DeliveryCacheDirectoryEntry> entryBuffer);
     Result GetCount(out int count);
 }
-}

src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheFileService.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace LibHac.Bcat.Impl.Ipc
+namespace LibHac.Bcat.Impl.Ipc;
-{
+
 public interface IDeliveryCacheFileService : IDisposable
 {
     Result Open(ref DirectoryName directoryName, ref FileName fileName);
@@ -9,4 +9,3 @@ namespace LibHac.Bcat.Impl.Ipc
     Result GetSize(out long size);
     Result GetDigest(out Digest digest);
 }
-}

src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheStorageService.cs

@@ -1,12 +1,11 @@
 using System;
 using LibHac.Common;
 
-namespace LibHac.Bcat.Impl.Ipc
+namespace LibHac.Bcat.Impl.Ipc;
-{
+
 public interface IDeliveryCacheStorageService : IDisposable
 {
     Result CreateFileService(ref SharedRef<IDeliveryCacheFileService> outFileService);
     Result CreateDirectoryService(ref SharedRef<IDeliveryCacheDirectoryService> outDirectoryService);
     Result EnumerateDeliveryCacheDirectory(out int namesRead, Span<DirectoryName> nameBuffer);
 }
-}

src/LibHac/Bcat/Impl/Ipc/IServiceCreator.cs

@@ -1,8 +1,8 @@
 using System;
 using LibHac.Common;
 
-namespace LibHac.Bcat.Impl.Ipc
+namespace LibHac.Bcat.Impl.Ipc;
-{
+
 public interface IServiceCreator : IDisposable
 {
     Result CreateDeliveryCacheStorageService(ref SharedRef<IDeliveryCacheStorageService> outService,
@@ -11,4 +11,3 @@ namespace LibHac.Bcat.Impl.Ipc
     Result CreateDeliveryCacheStorageServiceWithApplicationId(
         ref SharedRef<IDeliveryCacheStorageService> outService, ApplicationId applicationId);
 }
-}

src/LibHac/Bcat/Impl/Service/AccessControl.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace LibHac.Bcat.Impl.Service
+namespace LibHac.Bcat.Impl.Service;
-{
+
 [Flags]
 internal enum AccessControl
 {
@@ -12,4 +12,3 @@ namespace LibHac.Bcat.Impl.Service
     Debug = 1 << 4,
     All = ~0
 }
-}

src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheDirectoryMetaAccessor.cs

@@ -5,8 +5,8 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.Bcat.Impl.Service.Core
+namespace LibHac.Bcat.Impl.Service.Core;
-{
+
 internal class DeliveryCacheDirectoryMetaAccessor
 {
     private const int MaxEntryCount = 100;
@@ -98,4 +98,3 @@ namespace LibHac.Bcat.Impl.Service.Core
         }
     }
 }
-}

src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheDirectoryMetaEntry.cs

@@ -1,11 +1,10 @@
 using System.Runtime.InteropServices;
 
-namespace LibHac.Bcat.Impl.Service.Core
+namespace LibHac.Bcat.Impl.Service.Core;
-{
+
 [StructLayout(LayoutKind.Explicit, Size = 0x40)]
 internal struct DeliveryCacheDirectoryMetaEntry
 {
     [FieldOffset(0x00)] public DirectoryName Name;
     [FieldOffset(0x20)] public Digest Digest;
 }
-}

src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheFileMetaAccessor.cs

@@ -6,8 +6,8 @@ using LibHac.Fs;
 using LibHac.Fs.Fsa;
 using LibHac.Util;
 
-namespace LibHac.Bcat.Impl.Service.Core
+namespace LibHac.Bcat.Impl.Service.Core;
-{
+
 internal class DeliveryCacheFileMetaAccessor
 {
     private const int MaxEntryCount = 100;
@@ -119,4 +119,3 @@ namespace LibHac.Bcat.Impl.Service.Core
         }
     }
 }
-}

src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheFileMetaEntry.cs

@@ -1,7 +1,7 @@
 using System.Runtime.InteropServices;
 
-namespace LibHac.Bcat.Impl.Service.Core
+namespace LibHac.Bcat.Impl.Service.Core;
-{
+
 [StructLayout(LayoutKind.Explicit, Size = 0x80)]
 internal struct DeliveryCacheFileMetaEntry
 {
@@ -10,4 +10,3 @@ namespace LibHac.Bcat.Impl.Service.Core
     [FieldOffset(0x28)] public long Size;
     [FieldOffset(0x30)] public Digest Digest;
 }
-}

src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheStorageManager.cs

@@ -6,8 +6,8 @@ using LibHac.Fs.Fsa;
 using LibHac.Fs.Shim;
 using static LibHac.Fs.StringTraits;
 
-namespace LibHac.Bcat.Impl.Service.Core
+namespace LibHac.Bcat.Impl.Service.Core;
-{
+
 internal class DeliveryCacheStorageManager
 {
     private const int MaxEntryCount = 4;
@@ -396,4 +396,3 @@ namespace LibHac.Bcat.Impl.Service.Core
     private static ReadOnlySpan<byte> FilesDirectoryName => // files
         new[] { (byte)'f', (byte)'i', (byte)'l', (byte)'e', (byte)'s' };
 }
-}

src/LibHac/Bcat/Impl/Service/DeliveryCacheDirectoryService.cs

@@ -3,8 +3,8 @@ using LibHac.Bcat.Impl.Ipc;
 using LibHac.Bcat.Impl.Service.Core;
 using LibHac.Common;
 
-namespace LibHac.Bcat.Impl.Service
+namespace LibHac.Bcat.Impl.Service;
-{
+
 internal class DeliveryCacheDirectoryService : IDeliveryCacheDirectoryService
 {
     private BcatServer Server { get; }
@@ -104,4 +104,3 @@ namespace LibHac.Bcat.Impl.Service
         Parent.NotifyCloseDirectory();
     }
 }
-}

src/LibHac/Bcat/Impl/Service/DeliveryCacheFileService.cs

@@ -5,8 +5,8 @@ using LibHac.Common;
 using LibHac.Fs;
 using LibHac.Fs.Fsa;
 
-namespace LibHac.Bcat.Impl.Service
+namespace LibHac.Bcat.Impl.Service;
-{
+
 internal class DeliveryCacheFileService : IDeliveryCacheFileService
 {
     private BcatServer Server { get; }
@@ -120,4 +120,3 @@ namespace LibHac.Bcat.Impl.Service
         Parent.NotifyCloseFile();
     }
 }
-}

src/LibHac/Bcat/Impl/Service/DeliveryCacheStorageService.cs

@@ -5,8 +5,8 @@ using LibHac.Bcat.Impl.Service.Core;
 using LibHac.Common;
 using LibHac.Util;
 
-namespace LibHac.Bcat.Impl.Service
+namespace LibHac.Bcat.Impl.Service;
-{
+
 internal class DeliveryCacheStorageService : IDeliveryCacheStorageService
 {
     private const int MaxOpenCount = 8;
@@ -109,4 +109,3 @@ namespace LibHac.Bcat.Impl.Service
         Server.GetStorageManager().Release(ApplicationId);
     }
 }
-}

src/LibHac/Bcat/Impl/Service/ServiceCreator.cs

@@ -2,8 +2,8 @@
 using LibHac.Bcat.Impl.Ipc;
 using LibHac.Common;
 
-namespace LibHac.Bcat.Impl.Service
+namespace LibHac.Bcat.Impl.Service;
-{
+
 // Todo: Update BCAT service object management
 internal class ServiceCreator : IServiceCreator
 {
@@ -56,4 +56,3 @@ namespace LibHac.Bcat.Impl.Service
         return Result.Success;
     }
 }
-}

src/LibHac/Bcat/ResultBcat.cs

@@ -9,8 +9,8 @@
 // code generation portion of the build.
 //-----------------------------------------------------------------------------
 
-namespace LibHac.Bcat
+namespace LibHac.Bcat;
-{
+
 public static class ResultBcat
 {
     public const int ModuleBcat = 122;
@@ -52,4 +52,3 @@ namespace LibHac.Bcat
     /// <summary>Error code: 2122-0205; Inner value: 0x19a7a</summary>
     public static Result.Base StorageOpenLimitReached => new Result.Base(ModuleBcat, 205);
 }
-}

src/LibHac/BitReader.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Diagnostics;
 
-namespace LibHac
+namespace LibHac;
-{
+
 public class BitReader
 {
     public byte[] Buffer { get; private set; }
@@ -130,4 +130,3 @@ namespace LibHac
         Negative = 0
     }
 }
-}

src/LibHac/BitTools.cs

@@ -1,5 +1,5 @@
-namespace LibHac
+namespace LibHac;
-{
+
 public static class BitTools
 {
     public static int SignExtend32(int value, int bits)
@@ -8,4 +8,3 @@
         return (value << shift) >> shift;
     }
 }
-}

src/LibHac/Boot/KeyBlob.cs

@@ -6,8 +6,8 @@ using LibHac.Common;
 using LibHac.Crypto;
 using LibHac.Util;
 
-namespace LibHac.Boot
+namespace LibHac.Boot;
-{
+
 [DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Explicit, Size = 0xB0)]
 public struct EncryptedKeyBlob
@@ -91,4 +91,3 @@ namespace LibHac.Boot
 
     public override readonly string ToString() => ReadOnlyBytes.ToHexString();
 }
-}

src/LibHac/Boot/Package1.cs

@@ -9,8 +9,8 @@ using LibHac.Common.Keys;
 using LibHac.Diag;
 using LibHac.Util;
 
-namespace LibHac.Boot
+namespace LibHac.Boot;
-{
+
 [StructLayout(LayoutKind.Explicit, Size = 0x170)]
 public struct Package1MarikoOemHeader
 {
@@ -551,4 +551,3 @@ namespace LibHac.Boot
             (byte) '2', (byte) '0', (byte) '1', (byte) '8', (byte) '1', (byte) '1', (byte) '0', (byte) '7'
         };
 }
-}

src/LibHac/Boot/Package2.cs

@@ -8,8 +8,8 @@ using LibHac.Util;
 using System.Diagnostics;
 #endif
 
-namespace LibHac.Boot
+namespace LibHac.Boot;
-{
+
 [StructLayout(LayoutKind.Explicit, Size = 0x200)]
 public struct Package2Header
 {
@@ -161,4 +161,3 @@ namespace LibHac.Boot
     [DebuggerBrowsable(DebuggerBrowsableState.Never)] [FieldOffset(0x00)] private readonly Padding100 PaddingForVsDebugging;
 #endif
 }
-}

src/LibHac/Boot/Package2StorageReader.cs

@@ -8,8 +8,8 @@ using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Kernel;
 
-namespace LibHac.Boot
+namespace LibHac.Boot;
-{
+
 /// <summary>
 /// Parses a package2 file and opens the payloads within.
 /// </summary>
@@ -267,4 +267,3 @@ namespace LibHac.Boot
         return _header.Meta.PayloadSizes[IniPayloadIndex] != 0;
     }
 }
-}

src/LibHac/Calibration.cs

@@ -1,8 +1,8 @@
 using System.IO;
 using System.Text;
 
-namespace LibHac
+namespace LibHac;
-{
+
 public class Calibration
 {
     public const string ExpectedMagic = "CAL0";
@@ -272,4 +272,3 @@ namespace LibHac
         ConsoleSixAxisSensorMountType = reader.ReadBytes(0x1);
     }
 }
-}

src/LibHac/Cnmt.cs

@@ -4,8 +4,8 @@ using LibHac.FsSystem.NcaUtils;
 using LibHac.Ncm;
 using ContentType = LibHac.Ncm.ContentType;
 
-namespace LibHac
+namespace LibHac;
-{
+
 public class Cnmt
 {
     public ulong TitleId { get; }
@@ -323,4 +323,3 @@ namespace LibHac
         FragmentIndex = reader.ReadInt16();
     }
 }
-}

src/LibHac/Common/BlitSpan.cs

@@ -3,8 +3,8 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 /// <summary>
 /// Provides a representation of a region of memory as if it were a series of blittable structs
 /// of type <typeparamref name="T"/>. Also allows viewing the memory as a <see cref="Span{T}"/> of bytes.
@@ -107,4 +107,3 @@ namespace LibHac.Common
         return Unsafe.SizeOf<T>() * elementCount;
     }
 }
-}

src/LibHac/Common/BlitStruct.cs

@@ -3,8 +3,8 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 /// <summary>
 /// Handles storing a blittable struct or a series of blittable structs in a byte array.
 /// </summary>
@@ -67,4 +67,3 @@ namespace LibHac.Common
         return Unsafe.SizeOf<T>() * elementCount;
     }
 }
-}

src/LibHac/Common/Buffer.cs

@@ -4,8 +4,8 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using LibHac.Util;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 /// <summary>
 /// Represents a buffer of 16 bytes.
 /// Contains functions that assist with common operations on small buffers.
@@ -125,4 +125,3 @@ namespace LibHac.Common
         return Bytes.ToHexString();
     }
 }
-}

src/LibHac/Common/FixedArrays/Array1.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array1<T>
 {
@@ -19,4 +19,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array1<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array12.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array12<T>
 {
@@ -30,4 +30,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array12<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array128.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array128<T>
 {
@@ -29,4 +29,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array128<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array16.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array16<T>
 {
@@ -29,4 +29,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array16<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array2.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array2<T>
 {
@@ -20,4 +20,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array2<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array256.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array256<T>
 {
@@ -29,4 +29,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array256<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array3.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array3<T>
 {
@@ -21,4 +21,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array3<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array32.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array32<T>
 {
@@ -29,4 +29,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array32<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array4.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array4<T>
 {
@@ -22,4 +22,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array4<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array5.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array5<T>
 {
@@ -23,4 +23,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array5<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array64.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array64<T>
 {
@@ -29,4 +29,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array64<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/FixedArrays/Array8.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common.FixedArrays
+namespace LibHac.Common.FixedArrays;
-{
+
 [StructLayout(LayoutKind.Sequential)]
 public struct Array8<T>
 {
@@ -26,4 +26,3 @@ namespace LibHac.Common.FixedArrays
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static implicit operator ReadOnlySpan<T>(in Array8<T> value) => value.ItemsRo;
 }
-}

src/LibHac/Common/HResult.cs

@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using LibHac.Fs;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 [SuppressMessage("ReSharper", "InconsistentNaming")]
 internal static class HResult
 {
@@ -38,4 +38,3 @@ namespace LibHac.Common
         _ => ResultFs.UnexpectedInLocalFileSystemE.Value
     };
 }
-}

src/LibHac/Common/Id128.cs

@@ -3,8 +3,8 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using LibHac.Util;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 /// <summary>
 /// A generic 128-bit ID value.
 /// </summary>
@@ -82,4 +82,3 @@ namespace LibHac.Common
     public static bool operator <=(Id128 left, Id128 right) => left.CompareTo(right) <= 0;
     public static bool operator >=(Id128 left, Id128 right) => left.CompareTo(right) >= 0;
 }
-}

src/LibHac/Common/InitializationGuard.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 internal readonly ref struct InitializationGuard
 {
     private readonly Ref<nint> _guard;
@@ -92,4 +92,3 @@ namespace LibHac.Common
         return (guard & 1) != 0;
     }
 }
-}

src/LibHac/Common/InteropWin32.cs

@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 
 #pragma warning disable 649
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 public static unsafe class InteropWin32
 {
     [DllImport("kernel32.dll")]
@@ -61,4 +61,3 @@ namespace LibHac.Common
         public Span<char> AlternateFileName => MemoryMarshal.CreateSpan(ref _alternateFileName[0], 14);
     }
 }
-}

src/LibHac/Common/Key128.cs

@@ -3,8 +3,8 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using LibHac.Util;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 [DebuggerDisplay("{ToString()}")]
 [StructLayout(LayoutKind.Sequential, Size = 0x10)]
 public struct Key128 : IEquatable<Key128>
@@ -43,4 +43,3 @@ namespace LibHac.Common
     public static bool operator ==(Key128 left, Key128 right) => left.Equals(right);
     public static bool operator !=(Key128 left, Key128 right) => !(left == right);
 }
-}

src/LibHac/Common/Keys/DefaultKeySet.Empty.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace LibHac.Common.Keys
+namespace LibHac.Common.Keys;
-{
+
 internal static partial class DefaultKeySet
 {
     private static ReadOnlySpan<byte> RootKeysDev => new byte[] { };
@@ -16,4 +16,3 @@ namespace LibHac.Common.Keys
     private static ReadOnlySpan<byte> RsaSigningKeysProd => new byte[] { };
     private static ReadOnlySpan<byte> RsaKeys => new byte[] { };
 }
-}

src/LibHac/Common/Keys/DefaultKeySet.cs

@@ -4,8 +4,8 @@ using System.Runtime.InteropServices;
 
 using Type = LibHac.Common.Keys.KeyInfo.KeyType;
 
-namespace LibHac.Common.Keys
+namespace LibHac.Common.Keys;
-{
+
 internal static partial class DefaultKeySet
 {
     /// <summary>
@@ -178,4 +178,3 @@ namespace LibHac.Common.Keys
         return keys;
     }
 }
-}

src/LibHac/Common/Keys/ExternalKeyReader.cs

@@ -8,8 +8,8 @@ using LibHac.Fs;
 using LibHac.Spl;
 using LibHac.Util;
 
-namespace LibHac.Common.Keys
+namespace LibHac.Common.Keys;
-{
+
 public static class ExternalKeyReader
 {
     private const int ReadBufferSize = 1024;
@@ -585,4 +585,3 @@ namespace LibHac.Common.Keys
         return false;
     }
 }
-}

src/LibHac/Common/Keys/ExternalKeyWriter.cs

@@ -9,8 +9,8 @@ using LibHac.Util;
 using Type = LibHac.Common.Keys.KeyInfo.KeyType;
 using RangeType = LibHac.Common.Keys.KeyInfo.KeyRangeType;
 
-namespace LibHac.Common.Keys
+namespace LibHac.Common.Keys;
-{
+
 public static class ExternalKeyWriter
 {
     public static void PrintKeys(KeySet keySet, StringBuilder sb, List<KeyInfo> keys, Type filter, bool isDev)
@@ -170,4 +170,3 @@ namespace LibHac.Common.Keys
         return sb.ToString();
     }
 }
-}

src/LibHac/Common/Keys/KeyDerivation.cs

@@ -2,8 +2,8 @@
 using System.Runtime.InteropServices;
 using LibHac.Crypto;
 
-namespace LibHac.Common.Keys
+namespace LibHac.Common.Keys;
-{
+
 internal static class KeyDerivation
 {
     public static void DeriveAllKeys(KeySet keySet, IProgressReport logger = null)
@@ -395,4 +395,3 @@ namespace LibHac.Common.Keys
         }
     }
 }
-}

src/LibHac/Common/Keys/KeyInfo.cs

@@ -3,8 +3,8 @@ using System.Diagnostics;
 using LibHac.Diag;
 using LibHac.Util;
 
-namespace LibHac.Common.Keys
+namespace LibHac.Common.Keys;
-{
+
 [DebuggerDisplay("{" + nameof(Name) + "}")]
 public readonly struct KeyInfo
 {
@@ -164,4 +164,3 @@ namespace LibHac.Common.Keys
         return isValid1 && isValid2;
     }
 }
-}

src/LibHac/Common/Keys/KeySet.cs

@@ -8,8 +8,8 @@ using LibHac.Crypto;
 using LibHac.FsSrv;
 using LibHac.Util;
 
-namespace LibHac.Common.Keys
+namespace LibHac.Common.Keys;
-{
+
 public class KeySet
 {
     public enum Mode
@@ -381,4 +381,3 @@ namespace LibHac.Common.Keys
 {
     public RsaFullKey BetaNca0KeyAreaKey;
 }
-}

src/LibHac/Common/NonCopyableAttribute.cs

@@ -1,10 +1,9 @@
 using System;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 [AttributeUsage(AttributeTargets.Struct)]
 public sealed class NonCopyableAttribute : Attribute { }
 
 [AttributeUsage(AttributeTargets.Struct)]
 public sealed class NonCopyableDisposableAttribute : Attribute { }
-}

src/LibHac/Common/PaddingStructs.cs

@@ -1,8 +1,8 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 // In order for the Visual Studio debugger to accurately display a struct, every offset
 // in the struct that is used for the debugger display must be part of a field.
 // These padding structs make it easier to accomplish that.
@@ -49,4 +49,3 @@ namespace LibHac.Common
     [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly Padding100 Padding000;
     [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly Padding100 Padding100;
 }
-}

src/LibHac/Common/PathBuilder.cs

@@ -5,8 +5,8 @@ using LibHac.Fs;
 using LibHac.FsSystem;
 using LibHac.Util;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 [DebuggerDisplay("{ToString()}")]
 internal ref struct PathBuilder
 {
@@ -121,4 +121,3 @@ namespace LibHac.Common
         return StringUtils.Utf8ZToString(_buffer.Slice(0, Length));
     }
 }
-}

src/LibHac/Common/Ref.cs

@@ -6,8 +6,8 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 /// <summary>
 /// A <see langword="struct"/> that can store a reference to a value of a specified type.
 /// </summary>
@@ -131,4 +131,3 @@ namespace LibHac.Common
         return reference.Value;
     }
 }
-}

src/LibHac/Common/RentedArray.cs

@@ -2,8 +2,8 @@
 using System.Buffers;
 using System.Runtime.CompilerServices;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 public readonly ref struct RentedArray<T>
 {
     // It's faster to create new smaller arrays than rent them
@@ -38,4 +38,3 @@ namespace LibHac.Common
         }
     }
 }
-}

src/LibHac/Common/ResultLibHac.cs

@@ -11,8 +11,8 @@
 
 using System.Runtime.CompilerServices;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 public static class ResultLibHac
 {
     public const int ModuleLibHac = 428;
@@ -93,4 +93,3 @@ namespace LibHac.Common
             /// <summary>Error code: 2428-1043; Inner value: 0x827ac</summary>
             public static Result.Base InvalidPackage1Pk11Size => new Result.Base(ModuleLibHac, 1043);
 }
-}

src/LibHac/Common/SharedObjectHelpers.cs

@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 public static class Shared
 {
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -19,4 +19,3 @@ namespace LibHac.Common
         value = default;
     }
 }
-}

src/LibHac/Common/SharedRef.cs

@@ -6,8 +6,8 @@ using LibHac.Diag;
 
 #pragma warning disable LH0001
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 public static class SharedRefExtensions
 {
     // ReSharper disable once EntityNameCapturedOnly.Global
@@ -438,4 +438,3 @@ namespace LibHac.Common
         return sharedRef;
     }
 }
-}

src/LibHac/Common/SpanHelpers.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 public static class SpanExtensions
 {
     /// <summary>
@@ -114,4 +114,3 @@ namespace LibHac.Common
         return ref MemoryMarshal.Cast<TFrom, TTo>(span)[0];
     }
 }
-}

src/LibHac/Common/U8Span.cs

@@ -5,8 +5,8 @@ using System.Runtime.InteropServices;
 using System.Text;
 using LibHac.Util;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 [DebuggerDisplay("{ToString()}")]
 public readonly ref struct U8Span
 {
@@ -100,4 +100,3 @@ namespace LibHac.Common
     /// Otherwise, <see langword="false"/>.</returns>
     public bool IsEmpty() => _buffer.IsEmpty || MemoryMarshal.GetReference(_buffer) == 0;
 }
-}

src/LibHac/Common/U8SpanMutable.cs

@@ -5,8 +5,8 @@ using System.Runtime.InteropServices;
 using System.Text;
 using LibHac.Util;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 [DebuggerDisplay("{ToString()}")]
 public readonly ref struct U8SpanMutable
 {
@@ -96,4 +96,3 @@ namespace LibHac.Common
     /// Otherwise, <see langword="false"/>.</returns>
     public bool IsEmpty() => _buffer.IsEmpty || MemoryMarshal.GetReference(_buffer) == 0;
 }
-}

src/LibHac/Common/U8String.cs

@@ -3,8 +3,8 @@ using System.Diagnostics;
 using System.Text;
 using LibHac.Util;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 [DebuggerDisplay("{ToString()}")]
 public readonly struct U8String
 {
@@ -61,4 +61,3 @@ namespace LibHac.Common
     /// Otherwise, <see langword="false"/>.</returns>
     public bool IsEmpty() => _buffer == null || _buffer.Length < 1 || _buffer[0] == 0;
 }
-}

src/LibHac/Common/U8StringBuilder.cs

@@ -6,8 +6,8 @@ using System.Runtime.CompilerServices;
 using LibHac.Diag;
 using LibHac.Util;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 [DebuggerDisplay("{ToString()}")]
 public ref struct U8StringBuilder
 {
@@ -566,4 +566,3 @@ namespace LibHac.Common
         return ref sb;
     }
 }
-}

src/LibHac/Common/U8StringHelpers.cs

@@ -1,5 +1,5 @@
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 public static class U8StringHelpers
 {
     public static U8String ToU8String(this string value)
@@ -12,4 +12,3 @@
         return new U8Span(value);
     }
 }
-}

src/LibHac/Common/U8StringMutable.cs

@@ -3,8 +3,8 @@ using System.Diagnostics;
 using System.Text;
 using LibHac.Util;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 [DebuggerDisplay("{ToString()}")]
 public readonly struct U8StringMutable
 {
@@ -68,4 +68,3 @@ namespace LibHac.Common
     /// Otherwise, <see langword="false"/>.</returns>
     public bool IsEmpty() => _buffer == null || _buffer.Length < 1 || _buffer[0] == 0;
 }
-}

src/LibHac/Common/UniqueRef.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using static InlineIL.IL.Emit;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 public static class UniqueRefExtensions
 {
     // ReSharper disable once EntityNameCapturedOnly.Global
@@ -88,4 +88,3 @@ namespace LibHac.Common
         return oldValue;
     }
 }
-}

src/LibHac/Common/UnsafeHelpers.cs

@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 
-namespace LibHac.Common
+namespace LibHac.Common;
-{
+
 public static class UnsafeHelpers
 {
     /// <summary>
@@ -64,4 +64,3 @@ namespace LibHac.Common
         SkipParamInit(out value3);
     }
 }
-}

src/LibHac/Crypto/Aes.cs

@@ -7,8 +7,8 @@ using LibHac.Diag;
 
 using AesNi = System.Runtime.Intrinsics.X86.Aes;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public static class Aes
 {
     public const int KeySize128 = 0x10;
@@ -308,4 +308,3 @@ namespace LibHac.Crypto
         }
     }
 }
-}

src/LibHac/Crypto/AesCbcCipher.cs

@@ -1,8 +1,8 @@
 using System;
 using LibHac.Crypto.Impl;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public class AesCbcEncryptor : ICipher
 {
     private AesCbcMode _baseCipher;
@@ -34,4 +34,3 @@ namespace LibHac.Crypto
         _baseCipher.Decrypt(input, output);
     }
 }
-}

src/LibHac/Crypto/AesCbcCipherNi.cs

@@ -4,8 +4,8 @@ using System.Runtime.Intrinsics;
 using LibHac.Common;
 using LibHac.Crypto.Impl;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public class AesCbcEncryptorNi : ICipherWithIv
 {
     private AesCbcModeNi _baseCipher;
@@ -41,4 +41,3 @@ namespace LibHac.Crypto
         _baseCipher.Decrypt(input, output);
     }
 }
-}

src/LibHac/Crypto/AesCtrCipher.cs

@@ -2,8 +2,8 @@
 using LibHac.Common;
 using LibHac.Crypto.Impl;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public class AesCtrCipher : ICipherWithIv
 {
     private AesCtrMode _baseCipher;
@@ -21,4 +21,3 @@ namespace LibHac.Crypto
         _baseCipher.Transform(input, output);
     }
 }
-}

src/LibHac/Crypto/AesCtrCipherNi.cs

@@ -4,8 +4,8 @@ using System.Runtime.Intrinsics;
 using LibHac.Common;
 using LibHac.Crypto.Impl;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public class AesCtrCipherNi : ICipherWithIv
 {
     private AesCtrModeNi _baseCipher;
@@ -23,4 +23,3 @@ namespace LibHac.Crypto
         _baseCipher.Transform(input, output);
     }
 }
-}

src/LibHac/Crypto/AesEcbCipher.cs

@@ -1,8 +1,8 @@
 using System;
 using LibHac.Crypto.Impl;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public class AesEcbEncryptor : ICipher
 {
     private AesEcbMode _baseCipher;
@@ -34,4 +34,3 @@ namespace LibHac.Crypto
         _baseCipher.Decrypt(input, output);
     }
 }
-}

src/LibHac/Crypto/AesEcbCipherNi.cs

@@ -1,8 +1,8 @@
 using System;
 using LibHac.Crypto.Impl;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public class AesEcbEncryptorNi : ICipher
 {
     private AesEcbModeNi _baseCipher;
@@ -34,4 +34,3 @@ namespace LibHac.Crypto
         _baseCipher.Decrypt(input, output);
     }
 }
-}

src/LibHac/Crypto/AesXtsCipher.cs

@@ -2,8 +2,8 @@
 using LibHac.Common;
 using LibHac.Crypto.Impl;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public class AesXtsEncryptor : ICipherWithIv
 {
     private AesXtsMode _baseCipher;
@@ -39,4 +39,3 @@ namespace LibHac.Crypto
         _baseCipher.Decrypt(input, output);
     }
 }
-}

src/LibHac/Crypto/AesXtsCipherNi.cs

@@ -4,8 +4,8 @@ using System.Runtime.Intrinsics;
 using LibHac.Common;
 using LibHac.Crypto.Impl;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public class AesXtsEncryptorNi : ICipherWithIv
 {
     private AesXtsModeNi _baseCipher;
@@ -41,4 +41,3 @@ namespace LibHac.Crypto
         _baseCipher.Decrypt(input, output);
     }
 }
-}

src/LibHac/Crypto/CryptoUtil.cs

@@ -2,8 +2,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 internal static class CryptoUtil
 {
     public static bool IsSameBytes(ReadOnlySpan<byte> buffer1, ReadOnlySpan<byte> buffer2, int length)
@@ -27,4 +27,3 @@ namespace LibHac.Crypto
         return result == 0;
     }
 }
-}

src/LibHac/Crypto/ICipher.cs

@@ -1,8 +1,8 @@
 using System;
 using LibHac.Common;
 
-namespace LibHac.Crypto
+namespace LibHac.Crypto;
-{
+
 public interface ICipher
 {
     void Transform(ReadOnlySpan<byte> input, Span<byte> output);
@@ -12,4 +12,3 @@ namespace LibHac.Crypto
 {
     ref Buffer16 Iv { get; }
 }
-}