Merge pull request #69 from michaelwoerister/fix-warnings

Fix some warnings that prevent measureme being built as a path dependency of the compiler.

Author: wesleywiser

measureme/src/lib.rs

@@ -47,6 +47,8 @@
 //! [`StringId`]: struct.StringId.html
 //! [`TimestampKind`]: enum.TimestampKind.html
 
+#![deny(warnings)]
+
 mod event;
 mod file_header;
 #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]

measureme/src/profiler.rs

@@ -1,7 +1,7 @@
 use crate::file_header::{write_file_header, FILE_MAGIC_EVENT_STREAM};
 use crate::raw_event::{RawEvent, Timestamp, TimestampKind};
 use crate::serialization::SerializationSink;
-use crate::stringtable::{METADATA_STRING_ID, SerializableString, StringId, StringTableBuilder};
+use crate::stringtable::{SerializableString, StringId, StringTableBuilder};
 use std::error::Error;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;

measureme/src/stringtable.rs

@@ -265,7 +265,7 @@ pub struct StringTable {
     index: FxHashMap<StringId, Addr>,
 }
 
-impl<'data> StringTable {
+impl StringTable {
     pub fn new(string_data: Vec<u8>, index_data: Vec<u8>) -> Result<StringTable, Box<dyn Error>> {
         let string_data_format = read_file_header(&string_data, FILE_MAGIC_STRINGTABLE_DATA)?;
         let index_data_format = read_file_header(&index_data, FILE_MAGIC_STRINGTABLE_INDEX)?;
@@ -292,7 +292,7 @@ impl<'data> StringTable {
     }
 
     #[inline]
-    pub fn get(&self, id: StringId) -> StringRef {
+    pub fn get<'a>(&'a self, id: StringId) -> StringRef<'a> {
         StringRef { id, table: self }
     }
 }

measureme/src/testing_common.rs

@@ -17,7 +17,7 @@ fn mk_filestem(file_name_stem: &str) -> PathBuf {
 }
 
 // Generate some profiling data. This is the part that would run in rustc.
-fn generate_profiling_data<S: SerializationSink>(filestem: &Path) -> Vec<Event> {
+fn generate_profiling_data<S: SerializationSink>(filestem: &Path) -> Vec<Event<'static>> {
     let profiler = Arc::new(Profiler::<S>::new(Path::new(filestem)).unwrap());
 
     let event_id_reserved = StringId::reserved(42);
@@ -83,7 +83,7 @@ fn generate_profiling_data<S: SerializationSink>(filestem: &Path) -> Vec<Event>
 
 // Process some profiling data. This is the part that would run in a
 // post processing tool.
-fn process_profiling_data(filestem: &Path, expected_events: &[Event]) {
+fn process_profiling_data(filestem: &Path, expected_events: &[Event<'static>]) {
     let profiling_data = ProfilingData::new(filestem).unwrap();
 
     let mut count = 0;