Skip to content

Commit 21033b2

Browse files
committed
Small improvements
- no typeof for well-known type - removed commented members
1 parent 43842a5 commit 21033b2

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

Orm/Xtensive.Orm/Linq/ExpressionExtensions.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ public static class ExpressionExtensions
3131
private static readonly Type MemoryExtensionsType = typeof(MemoryExtensions);
3232

3333
private static readonly int[] MemoryExtensionsContainsMethodTokens;
34-
//private static readonly MethodInfo ReadOnlySpanContains2;
35-
//private static readonly MethodInfo ReadOnlySpanContains3;
36-
//private static readonly MethodInfo SpanContains;
3734
private static readonly MethodInfo EnumerableContains;
3835

3936
///<summary>
@@ -143,15 +140,15 @@ static ExpressionExtensions()
143140
var parameters = method.GetParameters();
144141
var genericDef = parameters[0].ParameterType.GetGenericTypeDefinition();
145142
if (genericDef == genericReadOnlySpan) {
146-
if (parameters.Length == 2 || parameters.Length==3)
143+
if (parameters.Length is 2 or 3)
147144
candiates.Add(method.MetadataToken);
148145
}
149146
else if (genericDef == genericSpan && parameters.Length == 2) {
150147
candiates.Add(method.MetadataToken);
151148
}
152149
}
153150
MemoryExtensionsContainsMethodTokens = candiates.ToArray();
154-
EnumerableContains = typeof(System.Linq.Enumerable).GetMethodEx(nameof(System.Linq.Enumerable.Contains), BindingFlags.Public | BindingFlags.Static, new string[1], new object[2]);
151+
EnumerableContains = WellKnownTypes.Enumerable.GetMethodEx(nameof(System.Linq.Enumerable.Contains), BindingFlags.Public | BindingFlags.Static, new string[1], new object[2]);
155152
}
156153
}
157154
}

Orm/Xtensive.Orm/Orm/Linq/WellKnownMembers.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,28 +174,28 @@ public static class Key
174174
public static class Enumerable
175175
{
176176
// Enumerable
177-
public static readonly MethodInfo Select = typeof(System.Linq.Enumerable).GetMethods().First(m => m.Name == nameof(System.Linq.Enumerable.Select));
177+
public static readonly MethodInfo Select = WellKnownTypes.Enumerable.GetMethods().First(m => m.Name == nameof(System.Linq.Enumerable.Select));
178178

179-
public static readonly MethodInfo First = typeof(System.Linq.Enumerable)
179+
public static readonly MethodInfo First = WellKnownTypes.Enumerable
180180
.GetMethods(BindingFlags.Static | BindingFlags.Public)
181181
.First(m => m.Name == nameof(System.Linq.Enumerable.First) && m.GetParameters().Length == 1);
182182

183-
public static readonly MethodInfo FirstOrDefault = typeof(System.Linq.Enumerable)
183+
public static readonly MethodInfo FirstOrDefault = WellKnownTypes.Enumerable
184184
.GetMethods(BindingFlags.Static | BindingFlags.Public)
185185
.First(m => m.Name == nameof(System.Linq.Enumerable.FirstOrDefault) && m.GetParameters().Length == 1);
186186

187-
public static readonly MethodInfo Single = typeof(System.Linq.Enumerable)
187+
public static readonly MethodInfo Single = WellKnownTypes.Enumerable
188188
.GetMethods(BindingFlags.Static | BindingFlags.Public)
189189
.First(m => m.Name == nameof(System.Linq.Enumerable.Single) && m.GetParameters().Length == 1);
190190

191-
public static readonly MethodInfo SingleOrDefault = typeof(System.Linq.Enumerable)
191+
public static readonly MethodInfo SingleOrDefault = WellKnownTypes.Enumerable
192192
.GetMethods(BindingFlags.Static | BindingFlags.Public)
193193
.First(m => m.Name == nameof(System.Linq.Enumerable.SingleOrDefault) && m.GetParameters().Length == 1);
194194

195195
public static readonly Type OfTuple = WellKnownInterfaces.EnumerableOfT.CachedMakeGenericType(typeof(Xtensive.Tuples.Tuple));
196-
public static readonly MethodInfo DefaultIfEmpty = typeof(System.Linq.Enumerable).GetMethods().First(m => m.Name == nameof(System.Linq.Enumerable.DefaultIfEmpty));
197-
public static readonly MethodInfo Contains = GetMethod(typeof(System.Linq.Enumerable), nameof(System.Linq.Enumerable.Contains), 1, 2);
198-
public static readonly MethodInfo Cast = GetMethod(typeof(System.Linq.Enumerable), nameof(System.Linq.Enumerable.Cast), 1, 1);
196+
public static readonly MethodInfo DefaultIfEmpty = WellKnownTypes.Enumerable.GetMethods().First(m => m.Name == nameof(System.Linq.Enumerable.DefaultIfEmpty));
197+
public static readonly MethodInfo Contains = GetMethod(WellKnownTypes.Enumerable, nameof(System.Linq.Enumerable.Contains), 1, 2);
198+
public static readonly MethodInfo Cast = GetMethod(WellKnownTypes.Enumerable, nameof(System.Linq.Enumerable.Cast), 1, 1);
199199
}
200200

201201
// IEntity

0 commit comments

Comments
 (0)