Merge pull request #1823 from SimonCropp/removeEnumerableBoxing

Remove Enumerable Boxing
FluentValidation · Sep 13, 2021 · 155cffc · 155cffc
2 parents 4fea061 + c02491f
commit 155cffc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/FluentValidation/Validators/EmptyValidator.cs b/src/FluentValidation/Validators/EmptyValidator.cs
@@ -22,7 +22,6 @@ namespace FluentValidation.Validators {
 	using System;
 	using System.Collections;
 	using Resources;
-	using System.Linq;
 
 	public class EmptyValidator<T,TProperty> : PropertyValidator<T,TProperty> {
 
@@ -34,7 +33,7 @@ public class EmptyValidator<T,TProperty> : PropertyValidator<T,TProperty> {
 				case string s when string.IsNullOrWhiteSpace(s):
 				case ICollection {Count: 0}:
 				case Array {Length: 0}:
-				case IEnumerable e when !e.Cast<object>().Any():
+				case IEnumerable e when !e.GetEnumerator().MoveNext():
 					return true;
 			}
 

diff --git a/src/FluentValidation/Validators/NotEmptyValidator.cs b/src/FluentValidation/Validators/NotEmptyValidator.cs
@@ -21,7 +21,6 @@
 namespace FluentValidation.Validators {
 	using System;
 	using System.Collections;
-	using System.Linq;
 	using Resources;
 
 	public class NotEmptyValidator<T,TProperty> : PropertyValidator<T, TProperty>, INotEmptyValidator {
@@ -33,8 +32,8 @@ public class NotEmptyValidator<T,TProperty> : PropertyValidator<T, TProperty>, I
 				case null:
 				case string s when string.IsNullOrWhiteSpace(s):
 				case ICollection {Count: 0}:
-				case Array {Length: 0}c:
-				case IEnumerable e when !e.Cast<object>().Any():
+				case Array {Length: 0}:
+				case IEnumerable e when !e.GetEnumerator().MoveNext():
 					return false;
 			}