Remove boxing from Empty/NotEmpty validators.

FluentValidation · Nov 18, 2022 · beb8f60 · beb8f60
1 parent 84462a6
commit beb8f60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/FluentValidation/Validators/EmptyValidator.cs b/src/FluentValidation/Validators/EmptyValidator.cs
@@ -22,6 +22,7 @@ namespace FluentValidation.Validators;
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using Resources;
 
 public class EmptyValidator<T,TProperty> : PropertyValidator<T,TProperty> {
@@ -38,13 +39,7 @@ public class EmptyValidator<T,TProperty> : PropertyValidator<T,TProperty> {
 				return true;
 		}
 
-		//TODO: Rewrite to avoid boxing
-		if (Equals(value, default(TProperty))) {
-			// Note: Code analysis indicates "Expression is always false" but this is incorrect.
-			return true;
-		}
-
-		return false;
+		return EqualityComparer<TProperty>.Default.Equals(value, default);
 	}
 
 	protected override string GetDefaultMessageTemplate(string errorCode) {

diff --git a/src/FluentValidation/Validators/NotEmptyValidator.cs b/src/FluentValidation/Validators/NotEmptyValidator.cs
@@ -22,6 +22,7 @@ namespace FluentValidation.Validators;
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 
 public class NotEmptyValidator<T,TProperty> : PropertyValidator<T, TProperty>, INotEmptyValidator {
 
@@ -37,13 +38,7 @@ public class NotEmptyValidator<T,TProperty> : PropertyValidator<T, TProperty>, I
 				return false;
 		}
 
-		//TODO: Rewrite to avoid boxing
-		if (Equals(value, default(TProperty))) {
-			// Note: Code analysis indicates "Expression is always false" but this is incorrect.
-			return false;
-		}
-
-		return true;
+		return !EqualityComparer<TProperty>.Default.Equals(value, default);
 	}
 
 	protected override string GetDefaultMessageTemplate(string errorCode) {