Use collection expressions

Author: khellang

src/Scrutor/ServiceTypeSelector.cs

@@ -20,13 +20,13 @@ public ServiceTypeSelector(IImplementationTypeSelector inner, ISet<Type> types)
 
     private ISet<Type> Types { get; }
 
-    private List<ISelector> Selectors { get; } = new();
+    private List<ISelector> Selectors { get; } = [];
 
     private RegistrationStrategy? RegistrationStrategy { get; set; }
 
     public ILifetimeSelector AsSelf()
     {
-        return As(t => new[] { t });
+        return As(t => [t]);
     }
 
     public ILifetimeSelector As<T>()
@@ -45,7 +45,7 @@ public ILifetimeSelector As(IEnumerable<Type> types)
     {
         Preconditions.NotNull(types, nameof(types));
 
-        return AddSelector(Types.Select(t => new TypeMap(t, types)), Enumerable.Empty<TypeFactoryMap>());
+        return AddSelector(Types.Select(t => new TypeMap(t, types)), []);
     }
 
     public ILifetimeSelector AsImplementedInterfaces()
@@ -70,7 +70,7 @@ public ILifetimeSelector AsSelfWithInterfaces(Func<Type, bool> predicate)
         Preconditions.NotNull(predicate, nameof(predicate));
 
         return AddSelector(
-            Types.Select(t => new TypeMap(t, new[] { t })),
+            Types.Select(t => new TypeMap(t, [t])),
             Types.Select(t => new TypeFactoryMap(t, x => x.GetRequiredService(t), Selector(t, predicate))));
 
         static IEnumerable<Type> Selector(Type type, Func<Type, bool> predicate)
@@ -79,7 +79,7 @@ static IEnumerable<Type> Selector(Type type, Func<Type, bool> predicate)
             {
                 // This prevents trying to register open generic types
                 // with an ImplementationFactory, which is unsupported.
-                return Enumerable.Empty<Type>();
+                return [];
             }
 
             return GetInterfaces(type).Where(predicate);
@@ -100,7 +100,7 @@ public ILifetimeSelector As(Func<Type, IEnumerable<Type>> selector)
     {
         Preconditions.NotNull(selector, nameof(selector));
 
-        return AddSelector(Types.Select(t => new TypeMap(t, selector(t))), Enumerable.Empty<TypeFactoryMap>());
+        return AddSelector(Types.Select(t => new TypeMap(t, selector(t))), []);
     }
 
     public IImplementationTypeSelector UsingAttributes()

src/Scrutor/TypeSourceSelector.cs

@@ -12,12 +12,12 @@ public class TypeSourceSelector : ITypeSourceSelector, ISelector
     private static Assembly EntryAssembly => Assembly.GetEntryAssembly()
                                              ?? throw new InvalidOperationException("Could not get entry assembly.");
 
-    private List<ISelector> Selectors { get; } = new();
+    private List<ISelector> Selectors { get; } = [];
 
     /// <inheritdoc />
     public IImplementationTypeSelector FromAssemblyOf<T>()
     {
-        return InternalFromAssembliesOf(new[] { typeof(T) });
+        return InternalFromAssembliesOf([typeof(T)]);
     }
 
     /// <summary>

test/Scrutor.Tests/ScanningTests.cs

@@ -307,7 +307,7 @@ public void CanCreateDefault()
 
             var remainingSetOfTypes = Collection
                 .Select(descriptor => descriptor.ServiceType)
-                .Except(types.Concat(new[] { typeof(DefaultAttributes) }))
+                .Except(types.Concat([typeof(DefaultAttributes)]))
                 .ToList();
 
             Assert.Equal(5, Collection.Count);