From 7f0c32282eddda3274ed1bd959da34f4a9985999 Mon Sep 17 00:00:00 2001 From: OwnageIsMagic Date: Wed, 2 Aug 2023 14:08:04 +0300 Subject: [PATCH 1/3] ArgumentOutOfRangeException: use corresponding default message for all overloads --- .../src/System/ArgumentOutOfRangeException.cs | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs b/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs index 97cf6349b26b8f..fe07f970b57c0d 100644 --- a/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs @@ -22,31 +22,22 @@ public class ArgumentOutOfRangeException : ArgumentException // Creates a new ArgumentOutOfRangeException with its message // string set to a default message explaining an argument was out of range. public ArgumentOutOfRangeException() - : base(SR.Arg_ArgumentOutOfRangeException) - { - HResult = HResults.COR_E_ARGUMENTOUTOFRANGE; - } + : this(null, null, null) {} public ArgumentOutOfRangeException(string? paramName) - : base(SR.Arg_ArgumentOutOfRangeException, paramName) - { - HResult = HResults.COR_E_ARGUMENTOUTOFRANGE; - } - + : this(paramName, null, null) {} + public ArgumentOutOfRangeException(string? paramName, string? message) - : base(message, paramName) - { - HResult = HResults.COR_E_ARGUMENTOUTOFRANGE; - } - + : this(paramName, null, message) {} + public ArgumentOutOfRangeException(string? message, Exception? innerException) : base(message, innerException) { HResult = HResults.COR_E_ARGUMENTOUTOFRANGE; } - + public ArgumentOutOfRangeException(string? paramName, object? actualValue, string? message) - : base(message, paramName) + : base(message ?? SR.Arg_ArgumentOutOfRangeException, paramName) { _actualValue = actualValue; HResult = HResults.COR_E_ARGUMENTOUTOFRANGE; From 3f624ff6fc8e347efde954744879c075efb1411b Mon Sep 17 00:00:00 2001 From: OwnageIsMagic Date: Wed, 2 Aug 2023 14:12:28 +0300 Subject: [PATCH 2/3] fix ws --- .../src/System/ArgumentOutOfRangeException.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs b/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs index fe07f970b57c0d..a9ca8dc3b7aad4 100644 --- a/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs @@ -35,7 +35,7 @@ public ArgumentOutOfRangeException(string? message, Exception? innerException) { HResult = HResults.COR_E_ARGUMENTOUTOFRANGE; } - + public ArgumentOutOfRangeException(string? paramName, object? actualValue, string? message) : base(message ?? SR.Arg_ArgumentOutOfRangeException, paramName) { From e404ef9721feb38aef1e22a171d89345ca416013 Mon Sep 17 00:00:00 2001 From: OwnageIsMagic Date: Wed, 2 Aug 2023 17:31:45 +0300 Subject: [PATCH 3/3] address review --- .../src/System/ArgumentOutOfRangeException.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs b/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs index a9ca8dc3b7aad4..a7f5068d152577 100644 --- a/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs +++ b/src/libraries/System.Private.CoreLib/src/System/ArgumentOutOfRangeException.cs @@ -26,12 +26,12 @@ public ArgumentOutOfRangeException() public ArgumentOutOfRangeException(string? paramName) : this(paramName, null, null) {} - + public ArgumentOutOfRangeException(string? paramName, string? message) : this(paramName, null, message) {} - + public ArgumentOutOfRangeException(string? message, Exception? innerException) - : base(message, innerException) + : base(message ?? SR.Arg_ArgumentOutOfRangeException, innerException) { HResult = HResults.COR_E_ARGUMENTOUTOFRANGE; }