Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rust: Use re-exported serde traits from glean #662

Merged
merged 1 commit into from
Feb 13, 2024
Merged

Rust: Use re-exported serde traits from glean #662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions glean_parser/templates/rust.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,19 @@ Jinja2 template is not. Please file bugs! #}
{% endif %}

{% elif struct.type == "object" %}
#[derive(Debug, Hash, Eq, PartialEq, SerdeSerialize)]
#[derive(Debug, Hash, Eq, PartialEq, ::glean::traits::__serde::Serialize, ::glean::traits::__serde::Deserialize)]
#[serde(crate = "::glean::traits::__serde")]
pub struct {{ name }} {
{% for itemname, val in struct.properties.items() %}
{% if val.type == "object" %}
#[serde(skip_serializing_if = "Option::is_none")]
{{itemname|snake_case}}: Option<{{ name ~ "Item" ~ itemname|Camelize ~ "Object" }}>,
pub {{itemname|snake_case}}: Option<{{ name ~ "Item" ~ itemname|Camelize ~ "Object" }}>,
{% elif val.type == "array" %}
#[serde(skip_serializing_if = "Vec::is_empty")]
{{itemname|snake_case}}: {{ name ~ "Item" ~ itemname|Camelize }},
pub {{itemname|snake_case}}: {{ name ~ "Item" ~ itemname|Camelize }},
{% else %}
#[serde(skip_serializing_if = "Option::is_none")]
{{itemname|snake_case}}: Option<{{val.type|structure_type_name}}>,
pub {{itemname|snake_case}}: Option<{{val.type|structure_type_name}}>,
{% endif %}
{% endfor %}
}
Expand Down Expand Up @@ -96,7 +97,7 @@ pub static {{ obj.name|snake_case }}: ::glean::private::__export::Lazy<::glean::
{% else %}
pub mod {{ category.name|snake_case }} {
#[allow(unused_imports)] // HistogramType might be unusued, let's avoid warnings
use glean::{private::*, traits::ExtraKeys, traits::NoExtraKeys, serde::Serialize, serde::Deserialize, CommonMetricData, HistogramType, Lifetime, TimeUnit, MemoryUnit};
use glean::{private::*, traits::ExtraKeys, traits::NoExtraKeys, CommonMetricData, HistogramType, Lifetime, TimeUnit, MemoryUnit};
{% for obj in category.objs.values() %}

{% if obj|attr("_generate_structure") %}
Expand Down