Remove a lot of code which wasn't needed any more.

Author: jskeet

csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs

@@ -147,17 +147,14 @@ public void FieldDescriptor()
             Assert.AreEqual(messageType, primitiveField.ContainingType);
             Assert.AreEqual(UnittestProto3.Descriptor, primitiveField.File);
             Assert.AreEqual(FieldType.Int32, primitiveField.FieldType);
-            Assert.AreEqual(MappedType.Int32, primitiveField.MappedType);
             Assert.IsNull(primitiveField.Options);
 
             Assert.AreEqual("single_nested_enum", enumField.Name);
             Assert.AreEqual(FieldType.Enum, enumField.FieldType);
-            Assert.AreEqual(MappedType.Enum, enumField.MappedType);
             // Assert.AreEqual(TestAllTypes.Types.NestedEnum.DescriptorProtoFile, enumField.EnumType);
 
             Assert.AreEqual("single_foreign_message", messageField.Name);
             Assert.AreEqual(FieldType.Message, messageField.FieldType);
-            Assert.AreEqual(MappedType.Message, messageField.MappedType);
             Assert.AreEqual(ForeignMessage.Descriptor, messageField.MessageType);
         }
 
@@ -169,9 +166,7 @@ public void FieldDescriptorLabel()
             FieldDescriptor repeatedField =
                 TestAllTypes.Descriptor.FindDescriptor<FieldDescriptor>("repeated_int32");
 
-            Assert.IsFalse(singleField.IsRequired);
             Assert.IsFalse(singleField.IsRepeated);
-            Assert.IsFalse(repeatedField.IsRequired);
             Assert.IsTrue(repeatedField.IsRepeated);
         }
 

csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj

@@ -89,7 +89,6 @@
     <Compile Include="IssuesTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestCornerCases.cs" />
-    <Compile Include="WireFormatTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ProtocolBuffers\ProtocolBuffers.csproj">

csharp/src/ProtocolBuffers.Test/WireFormatTest.cs

@@ -59,19 +59,11 @@ internal static void Copy(byte[] src, int srcOffset, byte[] dst, int dstOffset,
             }
             else
             {
-                ByteCopy(src, srcOffset, dst, dstOffset, count);
-            }
-        }
-
-        /// <summary>
-        /// Copy the bytes provided with a for loop, faster when there are only a few bytes to copy
-        /// </summary>
-        internal static void ByteCopy(byte[] src, int srcOffset, byte[] dst, int dstOffset, int count)
-        {
-            int stop = srcOffset + count;
-            for (int i = srcOffset; i < stop; i++)
-            {
-                dst[dstOffset++] = src[i];
+                int stop = srcOffset + count;
+                for (int i = srcOffset; i < stop; i++)
+                {
+                    dst[dstOffset++] = src[i];
+                }
             }
         }
 

csharp/src/ProtocolBuffers/ByteArray.cs

@@ -264,38 +264,6 @@ public bool Equals(ByteString other)
             return true;
         }
 
-        /// <summary>
-        /// Builder for ByteStrings which allows them to be created without extra
-        /// copying being involved. This has to be a nested type in order to have access
-        /// to the private ByteString constructor.
-        /// </summary>
-        internal sealed class CodedBuilder
-        {
-            private readonly CodedOutputStream output;
-            private readonly byte[] buffer;
-
-            internal CodedBuilder(int size)
-            {
-                buffer = new byte[size];
-                output = CodedOutputStream.CreateInstance(buffer);
-            }
-
-            internal ByteString Build()
-            {
-                output.CheckNoSpaceLeft();
-
-                // We can be confident that the CodedOutputStream will not modify the
-                // underlying bytes anymore because it already wrote all of them.  So,
-                // no need to make a copy.
-                return new ByteString(buffer);
-            }
-
-            internal CodedOutputStream CodedOutput
-            {
-                get { return output; }
-            }
-        }
-
         /// <summary>
         /// Used internally by CodedOutputStream to avoid creating a copy for the write
         /// </summary>