Merge 271ad8a into 91e53ea

ExtendedXmlSerializer · Nov 28, 2019 · 4e0defd · 4e0defd
2 parents 91e53ea + 271ad8a
commit 4e0defd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 43 deletions.
diff --git a/src/ExtendedXmlSerializer/ContentModel/Collections/MappedArraySerializers.cs b/src/ExtendedXmlSerializer/ContentModel/Collections/MappedArraySerializers.cs
@@ -8,18 +8,15 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
-using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
 
 namespace ExtendedXmlSerializer.ContentModel.Collections
 {
 	sealed class MappedArraySerializers : IContents
 	{
 		readonly IContents _contents;
 
-		public MappedArraySerializers(IContents contents)
-		{
-			_contents = contents;
-		}
+		public MappedArraySerializers(IContents contents) => _contents = contents;
 
 		public ISerializer Get(TypeInfo parameter)
 		{
@@ -53,25 +50,12 @@ public void Write(IFormatWriter writer, Array instance)
 			}
 		}
 
-		sealed class SizeOf<T> : ISource<int>
+		sealed class SizeOf<T> : DelegatedSource<int>
 		{
 			[UsedImplicitly]
 			public static SizeOf<T> Default { get; } = new SizeOf<T>();
 
-			SizeOf() {}
-
-			public int Get()
-			{
-				var dm = new DynamicMethod("func", typeof(int), Type.EmptyTypes);
-
-				ILGenerator il = dm.GetILGenerator();
-				il.Emit(OpCodes.Sizeof, typeof(T));
-				il.Emit(OpCodes.Ret);
-
-				var factory = (Func<int>)dm.CreateDelegate(typeof(Func<int>));
-				var result  = factory();
-				return result;
-			}
+			SizeOf() : base(Unsafe.SizeOf<T>) {}
 		}
 
 		sealed class Sizes : StructureCache<TypeInfo, int>

diff --git a/src/ExtendedXmlSerializer/ContentModel/Collections/MappedArraySpecification.cs b/src/ExtendedXmlSerializer/ContentModel/Collections/MappedArraySpecification.cs
@@ -1,23 +1,20 @@
-using System.Reflection;
-using ExtendedXmlSerializer.Core.Specifications;
-using ExtendedXmlSerializer.ReflectionModel;
-
-namespace ExtendedXmlSerializer.ContentModel.Collections
-{
-	sealed class MappedArraySpecification : ISpecification<TypeInfo>
-	{
-		public static MappedArraySpecification Default { get; } = new MappedArraySpecification();
-
-		readonly ISpecification<TypeInfo> _specification;
-
-		public MappedArraySpecification() : this(IsValueTypeSpecification.Default) {}
-
-		public MappedArraySpecification(ISpecification<TypeInfo> specification)
-		{
-			_specification = specification;
-		}
-
-		public bool IsSatisfiedBy(TypeInfo parameter) => parameter.GetArrayRank() > 1 &&
-		                                                 _specification.IsSatisfiedBy(parameter.GetElementType());
-	}
+using System.Reflection;
+using ExtendedXmlSerializer.Core.Specifications;
+using ExtendedXmlSerializer.ReflectionModel;
+
+namespace ExtendedXmlSerializer.ContentModel.Collections
+{
+	sealed class MappedArraySpecification : ISpecification<TypeInfo>
+	{
+		public static MappedArraySpecification Default { get; } = new MappedArraySpecification();
+
+		readonly ISpecification<TypeInfo> _specification;
+
+		public MappedArraySpecification() : this(IsValueTypeSpecification.Default) {}
+
+		public MappedArraySpecification(ISpecification<TypeInfo> specification) => _specification = specification;
+
+		public bool IsSatisfiedBy(TypeInfo parameter) => parameter.GetArrayRank() > 1 &&
+		                                                 _specification.IsSatisfiedBy(parameter.GetElementType());
+	}
 }
diff --git a/src/ExtendedXmlSerializer/ExtendedXmlSerializer.csproj b/src/ExtendedXmlSerializer/ExtendedXmlSerializer.csproj
@@ -56,7 +56,7 @@
     <PackageReference Include="NReco.LambdaParser" Version="1.0.10" />
     <PackageReference Include="Sprache" Version="2.2.0" />
     <PackageReference Include="System.Interactive" Version="4.0.0" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.6.0" />
     <PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
   </ItemGroup>
 </Project>