Skip to content

Commit 61db981

Browse files
Remove a few more naming rules and cleanup.
1 parent 8c3f9e8 commit 61db981

File tree

3 files changed

+38
-5
lines changed

3 files changed

+38
-5
lines changed

sixlabors.ruleset

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
<Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.CSharp.NetAnalyzers">
99
<Rule Id="CA1200" Action="None" />
1010
<Rule Id="CA1711" Action="None" />
11+
<Rule Id="CA1716" Action="None" />
1112
<Rule Id="CA1720" Action="None" />
1213
</Rules>
1314
<Rules AnalyzerId="Roslynator.CSharp.Analyzers" RuleNamespace="Roslynator.CSharp">
1415
<Rule Id="RCS1090" Action="None" />
16+
<Rule Id="RCS1161" Action="None" />
1517
<Rule Id="RCS1181" Action="None" />
1618
</Rules>
1719
<Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">

src/SharedInfrastructure/Guard.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ internal static partial class Guard
2424
public static void NotNull<TValue>(TValue value, string parameterName)
2525
where TValue : class
2626
{
27-
if (!(value is null))
27+
if (value is not null)
2828
{
2929
return;
3030
}

src/SharedInfrastructure/ThrowHelper.cs

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
namespace SixLabors
99
{
1010
/// <summary>
11-
/// Helper methods to throw exceptions
11+
/// Helper methods to throw exceptions.
1212
/// </summary>
13+
#pragma warning disable RCS1043 // Remove 'partial' modifier from type with a single part.
1314
internal static partial class ThrowHelper
15+
#pragma warning restore RCS1043 // Remove 'partial' modifier from type with a single part.
1416
{
1517
/// <summary>
1618
/// Throws an <see cref="ArgumentNullException"/> when <see cref="Guard.NotNull{TValue}"/> fails.
1719
/// </summary>
20+
/// <param name="name">The argument name.</param>
1821
[DoesNotReturn]
1922
[MethodImpl(MethodImplOptions.NoInlining)]
2023
public static void ThrowArgumentNullExceptionForNotNull(string name)
@@ -23,6 +26,8 @@ public static void ThrowArgumentNullExceptionForNotNull(string name)
2326
/// <summary>
2427
/// Throws an <see cref="ArgumentException"/> when <see cref="Guard.NotNullOrWhiteSpace"/> fails.
2528
/// </summary>
29+
/// <param name="value">The value.</param>
30+
/// <param name="name">The argument name.</param>
2631
[DoesNotReturn]
2732
[MethodImpl(MethodImplOptions.NoInlining)]
2833
public static void ThrowArgumentExceptionForNotNullOrWhitespace(string value, string name)
@@ -40,6 +45,10 @@ public static void ThrowArgumentExceptionForNotNullOrWhitespace(string value, st
4045
/// <summary>
4146
/// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.MustBeLessThan{TValue}"/> fails.
4247
/// </summary>
48+
/// <typeparam name="T">The type of value.</typeparam>
49+
/// <param name="value">The value.</param>
50+
/// <param name="max">The maximum allowable value.</param>
51+
/// <param name="name">The argument name.</param>
4352
[DoesNotReturn]
4453
[MethodImpl(MethodImplOptions.NoInlining)]
4554
public static void ThrowArgumentOutOfRangeExceptionForMustBeLessThan<T>(T value, T max, string name)
@@ -48,6 +57,10 @@ public static void ThrowArgumentOutOfRangeExceptionForMustBeLessThan<T>(T value,
4857
/// <summary>
4958
/// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.MustBeLessThanOrEqualTo{TValue}"/> fails.
5059
/// </summary>
60+
/// <typeparam name="T">The type of value.</typeparam>
61+
/// <param name="value">The value.</param>
62+
/// <param name="maximum">The maximum allowable value.</param>
63+
/// <param name="name">The argument name.</param>
5164
[DoesNotReturn]
5265
[MethodImpl(MethodImplOptions.NoInlining)]
5366
public static void ThrowArgumentOutOfRangeExceptionForMustBeLessThanOrEqualTo<T>(T value, T maximum, string name)
@@ -56,27 +69,45 @@ public static void ThrowArgumentOutOfRangeExceptionForMustBeLessThanOrEqualTo<T>
5669
/// <summary>
5770
/// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.MustBeGreaterThan{TValue}"/> fails.
5871
/// </summary>
72+
/// <typeparam name="T">The type of value.</typeparam>
73+
/// <param name="value">The value.</param>
74+
/// <param name="minimum">The minimum allowable value.</param>
75+
/// <param name="name">The argument name.</param>
5976
[DoesNotReturn]
6077
[MethodImpl(MethodImplOptions.NoInlining)]
61-
public static void ThrowArgumentOutOfRangeExceptionForMustBeGreaterThan<T>(T value, T minimum, string name) => ThrowArgumentOutOfRangeException(name, $"Parameter \"{name}\" ({typeof(T)}) must be greater than {minimum}, was {value}");
78+
public static void ThrowArgumentOutOfRangeExceptionForMustBeGreaterThan<T>(T value, T minimum, string name)
79+
=> ThrowArgumentOutOfRangeException(name, $"Parameter \"{name}\" ({typeof(T)}) must be greater than {minimum}, was {value}");
6280

6381
/// <summary>
6482
/// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.MustBeGreaterThanOrEqualTo{TValue}"/> fails.
6583
/// </summary>
84+
/// <typeparam name="T">The type of value.</typeparam>
85+
/// <param name="value">The value.</param>
86+
/// <param name="minimum">The minimum allowable value.</param>
87+
/// <param name="name">The argument name.</param>
6688
[DoesNotReturn]
6789
[MethodImpl(MethodImplOptions.NoInlining)]
68-
public static void ThrowArgumentOutOfRangeExceptionForMustBeGreaterThanOrEqualTo<T>(T value, T minimum, string name) => ThrowArgumentOutOfRangeException(name, $"Parameter \"{name}\" ({typeof(T)}) must be greater than or equal to {minimum}, was {value}");
90+
public static void ThrowArgumentOutOfRangeExceptionForMustBeGreaterThanOrEqualTo<T>(T value, T minimum, string name)
91+
=> ThrowArgumentOutOfRangeException(name, $"Parameter \"{name}\" ({typeof(T)}) must be greater than or equal to {minimum}, was {value}");
6992

7093
/// <summary>
7194
/// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.MustBeBetweenOrEqualTo{TValue}"/> fails.
7295
/// </summary>
96+
/// <typeparam name="T">The type of value.</typeparam>
97+
/// <param name="value">The value.</param>
98+
/// <param name="minimum">The minimum allowable value.</param>
99+
/// <param name="maximum">The maximum allowable value.</param>
100+
/// <param name="name">The argument name.</param>
73101
[DoesNotReturn]
74102
[MethodImpl(MethodImplOptions.NoInlining)]
75-
public static void ThrowArgumentOutOfRangeExceptionForMustBeBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name) => ThrowArgumentOutOfRangeException(name, $"Parameter \"{name}\" ({typeof(T)}) must be between or equal to {minimum} and {maximum}, was {value}");
103+
public static void ThrowArgumentOutOfRangeExceptionForMustBeBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
104+
=> ThrowArgumentOutOfRangeException(name, $"Parameter \"{name}\" ({typeof(T)}) must be between or equal to {minimum} and {maximum}, was {value}");
76105

77106
/// <summary>
78107
/// Throws an <see cref="ArgumentException"/> when <see cref="Guard.MustBeSizedAtLeast{T}(ReadOnlySpan{T},int,string)"/> fails.
79108
/// </summary>
109+
/// <param name="minLength">The minimum allowable length.</param>
110+
/// <param name="parameterName">The paramere name.</param>
80111
[DoesNotReturn]
81112
[MethodImpl(MethodImplOptions.NoInlining)]
82113
public static void ThrowArgumentOutOfRangeExceptionForMustBeSizedAtLeast(int minLength, string parameterName)

0 commit comments

Comments
 (0)