Commit 3a0af781 authored by Sandor Molnar's avatar Sandor Molnar
Browse files

Backed out 2 changesets (bug 1868296, bug 1868293) for causing build bustages.CLOSED TREE 

Backed out changeset 860832637944 (bug 1868296)
Backed out changeset c8356d039b51 (bug 1868293)
parent 29902f27

toolkit/components/glean/api/src/ffi/event.rs

+2 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ pub extern "C" fn fog_event_record( 
            Some(m) => m.record_raw(extra),

            None => panic!("No (dynamic) metric for event with id {}", id),

        }

        return;

    } else {

        match metric_maps::record_event_by_id(id, extra) {

            Ok(()) => {}
@@ -147,7 +148,7 @@ pub extern "C" fn fog_event_test_get_value( 
    };



    for event in events {

        let extra = event.extra.unwrap_or_default();

        let extra = event.extra.unwrap_or_else(HashMap::new);

        let extra_len = extra.len();

        let mut extras = ThinVec::with_capacity(extra_len * 2);

        for (k, v) in extra.into_iter() {

toolkit/components/glean/api/src/private/event.rs

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ impl<K: 'static + ExtraKeys + Send + Sync> Event for EventMetric<K> { 
            EventMetric::Child(_) => {

                let now = glean::get_timestamp_ms();

                let extra = extra.into().map(|extra| extra.into_ffi_extra());

                let extra = extra.unwrap_or_default();

                let extra = extra.unwrap_or_else(HashMap::new);

                self.record_with_time(now, extra);

            }

        }