Remove the generic SerializationSink parameter from StringTableBuilder.

Author: michaelwoerister

analyzeme/src/profiling_data.rs

@@ -204,7 +204,7 @@ pub struct ProfilingDataBuilder {
     event_sink: FileSerializationSink,
     string_table_data_sink: Arc<FileSerializationSink>,
     string_table_index_sink: Arc<FileSerializationSink>,
-    string_table: StringTableBuilder<FileSerializationSink>,
+    string_table: StringTableBuilder,
 }
 
 impl ProfilingDataBuilder {

measureme/src/profiler.rs

@@ -27,7 +27,7 @@ impl ProfilerFiles {
 
 pub struct Profiler {
     event_sink: Arc<FileSerializationSink>,
-    string_table: StringTableBuilder<FileSerializationSink>,
+    string_table: StringTableBuilder,
     start_time: Instant,
 }
 

measureme/src/stringtable.rs

@@ -66,6 +66,7 @@
 use crate::file_header::{
     write_file_header, FILE_MAGIC_STRINGTABLE_DATA, FILE_MAGIC_STRINGTABLE_INDEX,
 };
+use crate::file_serialization_sink::FileSerializationSink;
 use crate::serialization::{Addr, SerializationSink};
 use std::sync::Arc;
 
@@ -135,9 +136,9 @@ const INVALID_STRING_ID: u32 = METADATA_STRING_ID + 1;
 pub const FIRST_REGULAR_STRING_ID: u32 = INVALID_STRING_ID + 1;
 
 /// Write-only version of the string table
-pub struct StringTableBuilder<S: SerializationSink> {
-    data_sink: Arc<S>,
-    index_sink: Arc<S>,
+pub struct StringTableBuilder {
+    data_sink: Arc<FileSerializationSink>,
+    index_sink: Arc<FileSerializationSink>,
 }
 
 /// Anything that implements `SerializableString` can be written to a
@@ -250,15 +251,18 @@ impl_serializable_string_for_fixed_size!(14);
 impl_serializable_string_for_fixed_size!(15);
 impl_serializable_string_for_fixed_size!(16);
 
-fn serialize_index_entry<S: SerializationSink>(sink: &S, id: StringId, addr: Addr) {
+fn serialize_index_entry(sink: &FileSerializationSink, id: StringId, addr: Addr) {
     sink.write_atomic(8, |bytes| {
         bytes[0..4].copy_from_slice(&id.0.to_le_bytes());
         bytes[4..8].copy_from_slice(&addr.0.to_le_bytes());
     });
 }
 
-impl<S: SerializationSink> StringTableBuilder<S> {
-    pub fn new(data_sink: Arc<S>, index_sink: Arc<S>) -> StringTableBuilder<S> {
+impl StringTableBuilder {
+    pub fn new(
+        data_sink: Arc<FileSerializationSink>,
+        index_sink: Arc<FileSerializationSink>,
+    ) -> StringTableBuilder {
         // The first thing in every file we generate must be the file header.
         write_file_header(&*data_sink, FILE_MAGIC_STRINGTABLE_DATA);
         write_file_header(&*index_sink, FILE_MAGIC_STRINGTABLE_INDEX);