From 850f7f335ab5d4fc9a1a61645f28cfac7b5cebb1 Mon Sep 17 00:00:00 2001 From: Jeremy Pritts <49847914+ds5678@users.noreply.github.com> Date: Sat, 30 Sep 2023 10:49:53 -0400 Subject: [PATCH] Formatting --- .../NumericConversionGenerator.cs | 1 - AssetRipper.TextureDecoder.ConsoleApp/Program.cs | 1 - .../CSharpPrimitives.cs | 1 - .../TestClassGenerator.cs | 1 - AssetRipper.TextureDecoder.Tests/AtcTests.cs | 2 +- AssetRipper.TextureDecoder.Tests/RgbTests.cs | 5 +---- AssetRipper.TextureDecoder/GlobalUsings.cs | 3 ++- AssetRipper.TextureDecoder/Rgb/IColor.cs | 2 +- AssetRipper.TextureDecoder/Rgb/NumericConversion.cs | 7 ++++--- 9 files changed, 9 insertions(+), 14 deletions(-) diff --git a/AssetRipper.TextureDecoder.ColorGenerator/NumericConversionGenerator.cs b/AssetRipper.TextureDecoder.ColorGenerator/NumericConversionGenerator.cs index cc8285d..8928246 100644 --- a/AssetRipper.TextureDecoder.ColorGenerator/NumericConversionGenerator.cs +++ b/AssetRipper.TextureDecoder.ColorGenerator/NumericConversionGenerator.cs @@ -2,7 +2,6 @@ using AssetRipper.TextureDecoder.SourceGeneration.Common; using System.CodeDom.Compiler; using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; namespace AssetRipper.TextureDecoder.ColorGenerator; internal static class NumericConversionGenerator diff --git a/AssetRipper.TextureDecoder.ConsoleApp/Program.cs b/AssetRipper.TextureDecoder.ConsoleApp/Program.cs index 5e32370..74f9bb2 100644 --- a/AssetRipper.TextureDecoder.ConsoleApp/Program.cs +++ b/AssetRipper.TextureDecoder.ConsoleApp/Program.cs @@ -4,7 +4,6 @@ using AssetRipper.TextureDecoder.Bc; using AssetRipper.TextureDecoder.Dxt; using AssetRipper.TextureDecoder.Etc; using AssetRipper.TextureDecoder.Pvrtc; -using AssetRipper.TextureDecoder.Rgb; using AssetRipper.TextureDecoder.Rgb.Formats; using AssetRipper.TextureDecoder.Yuy2; diff --git a/AssetRipper.TextureDecoder.SourceGeneration.Common/CSharpPrimitives.cs b/AssetRipper.TextureDecoder.SourceGeneration.Common/CSharpPrimitives.cs index 3395ca6..34b83f7 100644 --- a/AssetRipper.TextureDecoder.SourceGeneration.Common/CSharpPrimitives.cs +++ b/AssetRipper.TextureDecoder.SourceGeneration.Common/CSharpPrimitives.cs @@ -1,5 +1,4 @@ using System.Diagnostics.CodeAnalysis; -using System.Numerics; using System.Runtime.CompilerServices; namespace AssetRipper.TextureDecoder.SourceGeneration.Common; diff --git a/AssetRipper.TextureDecoder.TestGenerator/TestClassGenerator.cs b/AssetRipper.TextureDecoder.TestGenerator/TestClassGenerator.cs index 90cf299..271c6d3 100644 --- a/AssetRipper.TextureDecoder.TestGenerator/TestClassGenerator.cs +++ b/AssetRipper.TextureDecoder.TestGenerator/TestClassGenerator.cs @@ -1,5 +1,4 @@ using AssetRipper.Text.SourceGeneration; -using AssetRipper.TextureDecoder.Rgb; using AssetRipper.TextureDecoder.Rgb.Formats; using AssetRipper.TextureDecoder.SourceGeneration.Common; using AssetRipper.TextureDecoder.TestGenerator; diff --git a/AssetRipper.TextureDecoder.Tests/AtcTests.cs b/AssetRipper.TextureDecoder.Tests/AtcTests.cs index 5405561..bbc186a 100644 --- a/AssetRipper.TextureDecoder.Tests/AtcTests.cs +++ b/AssetRipper.TextureDecoder.Tests/AtcTests.cs @@ -11,7 +11,7 @@ { Assert.That(bytesRead, Is.EqualTo(data.Length)); Assert.That(decodedData, Is.EqualTo(File.ReadAllBytes(TestFileFolders.AtcTestFiles + "test.atc_rgb4_decoded"))); - }); + }); } [Test] diff --git a/AssetRipper.TextureDecoder.Tests/RgbTests.cs b/AssetRipper.TextureDecoder.Tests/RgbTests.cs index b8cf94d..5342375 100644 --- a/AssetRipper.TextureDecoder.Tests/RgbTests.cs +++ b/AssetRipper.TextureDecoder.Tests/RgbTests.cs @@ -1,7 +1,4 @@ -using AssetRipper.TextureDecoder.Rgb; -using AssetRipper.TextureDecoder.Rgb.Formats; - -namespace AssetRipper.TextureDecoder.Tests +namespace AssetRipper.TextureDecoder.Tests { public sealed class RgbTests { diff --git a/AssetRipper.TextureDecoder/GlobalUsings.cs b/AssetRipper.TextureDecoder/GlobalUsings.cs index a938a10..444476c 100644 --- a/AssetRipper.TextureDecoder/GlobalUsings.cs +++ b/AssetRipper.TextureDecoder/GlobalUsings.cs @@ -1,3 +1,4 @@ global using System; +global using System.Diagnostics.CodeAnalysis; global using System.Numerics; -global using System.Runtime.CompilerServices; \ No newline at end of file +global using System.Runtime.CompilerServices; diff --git a/AssetRipper.TextureDecoder/Rgb/IColor.cs b/AssetRipper.TextureDecoder/Rgb/IColor.cs index f1dcf28..7ee7560 100644 --- a/AssetRipper.TextureDecoder/Rgb/IColor.cs +++ b/AssetRipper.TextureDecoder/Rgb/IColor.cs @@ -1,5 +1,5 @@ namespace AssetRipper.TextureDecoder.Rgb -{ +{ /// /// An for handling color formats with up to 4 channels. /// diff --git a/AssetRipper.TextureDecoder/Rgb/NumericConversion.cs b/AssetRipper.TextureDecoder/Rgb/NumericConversion.cs index 65beb9a..1c61aad 100644 --- a/AssetRipper.TextureDecoder/Rgb/NumericConversion.cs +++ b/AssetRipper.TextureDecoder/Rgb/NumericConversion.cs @@ -1,6 +1,4 @@ -using System.Numerics; - -namespace AssetRipper.TextureDecoder.Rgb; +namespace AssetRipper.TextureDecoder.Rgb; public static partial class NumericConversion { public static T GetMinimumValue() where T : unmanaged, INumberBase, IMinMaxValue @@ -17,6 +15,9 @@ public static partial class NumericConversion : T.MaxValue; } +#if DEBUG + [DoesNotReturn] +#endif [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] private static T ThrowOrReturnDefault() where T : struct {