pr

Author: Robo210

src/statics.rs

@@ -81,18 +81,17 @@ static EVENT_METADATA: LazyLock<Box<[ParsedEventMetadata]>> = LazyLock::new(|| {
 
     let bh = FnvHasher::default();
 
-    let mut map: Box<[core::mem::MaybeUninit<ParsedEventMetadata>]> = Box::new_uninit_slice(good_pos + 1);
+    let mut vec = Vec::with_capacity(good_pos + 1);
     next_pos = 0;
     while next_pos <= good_pos {
         // SAFETY The above code as already validated that events_slice[0..good_pos] are non-null pointers
         let next = unsafe { &*events_slice[next_pos] };
         let identity_hash = bh.hash_one(&next.identity);
-        // SAFETY The pointer being written to is valid (we just allocated it above) and aligned (it was allocated with the same type as being written)
-        unsafe { map[next_pos].as_mut_ptr().write(ParsedEventMetadata { identity_hash, meta: next }) };
+        vec.push(ParsedEventMetadata { identity_hash, meta: next });
         next_pos += 1;
     }
-    // SAFETY We've explicitly initialized all the values now
-    let mut sorted = unsafe { map.assume_init() };
+
+    let mut sorted = vec.into_boxed_slice();
     sorted.sort_unstable_by(|a, b| b.cmp(a));
     sorted
 });
@@ -111,23 +110,10 @@ impl core::cmp::PartialOrd for ParsedEventMetadata {
     }
 }
 
+// Order by hash only
 impl core::cmp::Ord for ParsedEventMetadata {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        match self.identity_hash.cmp(&other.identity_hash) {
-            cmp::Ordering::Equal => {
-                match self.meta.identity == other.meta.identity {
-                    true => cmp::Ordering::Equal,
-                    false => {
-                        // We need to do *something* to sort two different callsites that hit a hash collision.
-                        // TODO: This only works when comparing the static entries generated by the logging macros.
-                        let lhs = &self.meta.identity as *const tracing_core::callsite::Identifier as usize;
-                        let rhs = &other.meta.identity as *const tracing_core::callsite::Identifier as usize;
-                        lhs.cmp(&rhs)
-                    }
-                }
-            },
-            x => x
-        }
+        self.identity_hash.cmp(&other.identity_hash)
     }
 }
 
@@ -179,7 +165,7 @@ pub(crate) fn event_metadata() -> impl Iterator<Item = <EventMetadataEnumerator
     EventMetadataEnumerator{current_index: 0}
 }
 
-// Only one test function can be compiled into the module at a time, since the statics they produce are global
+// Only one test function can be compiled into the module at a time, since the statics the macro produces are global
 #[cfg(test)]
 mod test {
     use tracing::Level;