Skip to content

Commit 38fa425

Browse files
leovalaisleovalais
committed
editoast: derive: replace vec! by Vec::from in macro expansions
Macros confuses `prettyplease` and we want snapshots as clean as possible. Signed-off-by: Leo Valais <[email protected]>
1 parent 3ed4e78 commit 38fa425

File tree

3 files changed

+76
-36
lines changed

3 files changed

+76
-36
lines changed

‎editoast/editoast_derive/src/search.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ pub fn expand_search(input: &DeriveInput) -> Result<TokenStream> {
287287
editoast_search::SearchConfig {
288288
table: #table.to_owned(),
289289
joins: #joins,
290-
criterias: vec![#criterias],
291-
properties: vec![#properties],
290+
criterias: Vec::from([#criterias]),
291+
properties: Vec::from([#properties]),
292292
migration: #migration,
293293
}
294294
}
@@ -335,12 +335,12 @@ pub fn expand_store(input: &DeriveInput) -> Result<TokenStream> {
335335
}
336336

337337
fn all() -> Vec<(&'static str, editoast_search::SearchConfig)> {
338-
vec![#(
338+
Vec::from([#(
339339
(
340340
#object_name,
341341
< #ident as editoast_search::SearchObject > :: search_config()
342342
)
343-
),*]
343+
),*])
344344
}
345345
}
346346

‎editoast/editoast_derive/src/snapshots/editoast_derive__search__tests__search_construction.snap

+42-20
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,48 @@ impl editoast_search::SearchObject for Track {
2727
editoast_search::SearchConfig {
2828
table: "search_track".to_owned(),
2929
joins: None,
30-
criterias: vec![
31-
editoast_search::Criteria { name : "infra_id".to_owned(), data_type :
32-
editoast_search::TypeSpec::Type(editoast_search::AstType::Integer),
33-
migration : None, }, editoast_search::Criteria { name : "line_code"
34-
.to_owned(), data_type :
35-
editoast_search::TypeSpec::Type(editoast_search::AstType::Integer),
36-
migration : None, }, editoast_search::Criteria { name : "line_name"
37-
.to_owned(), data_type :
38-
editoast_search::TypeSpec::Type(editoast_search::AstType::String),
39-
migration : None, }
40-
],
41-
properties: vec![
42-
editoast_search::Property { name : "infra_id".to_owned(), sql :
43-
"search_track.infra_id".to_owned(), data_type : None, },
44-
editoast_search::Property { name : "line_name".to_owned(), sql :
45-
"search_track.unprocessed_line_name".to_owned(), data_type :
46-
Some(editoast_search::TypeSpec::Type(editoast_search::AstType::String)),
47-
}, editoast_search::Property { name : "code".to_owned(), sql :
48-
"search_track.line_code".to_owned(), data_type : None, }
49-
],
30+
criterias: Vec::from([
31+
editoast_search::Criteria {
32+
name: "infra_id".to_owned(),
33+
data_type: editoast_search::TypeSpec::Type(
34+
editoast_search::AstType::Integer,
35+
),
36+
migration: None,
37+
},
38+
editoast_search::Criteria {
39+
name: "line_code".to_owned(),
40+
data_type: editoast_search::TypeSpec::Type(
41+
editoast_search::AstType::Integer,
42+
),
43+
migration: None,
44+
},
45+
editoast_search::Criteria {
46+
name: "line_name".to_owned(),
47+
data_type: editoast_search::TypeSpec::Type(
48+
editoast_search::AstType::String,
49+
),
50+
migration: None,
51+
},
52+
]),
53+
properties: Vec::from([
54+
editoast_search::Property {
55+
name: "infra_id".to_owned(),
56+
sql: "search_track.infra_id".to_owned(),
57+
data_type: None,
58+
},
59+
editoast_search::Property {
60+
name: "line_name".to_owned(),
61+
sql: "search_track.unprocessed_line_name".to_owned(),
62+
data_type: Some(
63+
editoast_search::TypeSpec::Type(editoast_search::AstType::String),
64+
),
65+
},
66+
editoast_search::Property {
67+
name: "code".to_owned(),
68+
sql: "search_track.line_code".to_owned(),
69+
data_type: None,
70+
},
71+
]),
5072
migration: None,
5173
}
5274
}

‎editoast/editoast_derive/src/snapshots/editoast_derive__search__tests__store_construction.snap

+30-12
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,36 @@ impl editoast_search::SearchConfigStore for SearchStore {
6161
}
6262
}
6363
fn all() -> Vec<(&'static str, editoast_search::SearchConfig)> {
64-
vec![
65-
("track", < SearchResultItemTrack as editoast_search::SearchObject >
66-
::search_config()), ("operationalpoint", < SearchResultItemOperationalPoint
67-
as editoast_search::SearchObject > ::search_config()), ("signal", <
68-
SearchResultItemSignal as editoast_search::SearchObject > ::search_config()),
69-
("project", < SearchResultItemProject as editoast_search::SearchObject >
70-
::search_config()), ("study", < SearchResultItemStudy as
71-
editoast_search::SearchObject > ::search_config()), ("scenario", <
72-
SearchResultItemScenario as editoast_search::SearchObject >
73-
::search_config()), ("trainschedule", < SearchResultItemTrainSchedule as
74-
editoast_search::SearchObject > ::search_config())
75-
]
64+
Vec::from([
65+
(
66+
"track",
67+
<SearchResultItemTrack as editoast_search::SearchObject>::search_config(),
68+
),
69+
(
70+
"operationalpoint",
71+
<SearchResultItemOperationalPoint as editoast_search::SearchObject>::search_config(),
72+
),
73+
(
74+
"signal",
75+
<SearchResultItemSignal as editoast_search::SearchObject>::search_config(),
76+
),
77+
(
78+
"project",
79+
<SearchResultItemProject as editoast_search::SearchObject>::search_config(),
80+
),
81+
(
82+
"study",
83+
<SearchResultItemStudy as editoast_search::SearchObject>::search_config(),
84+
),
85+
(
86+
"scenario",
87+
<SearchResultItemScenario as editoast_search::SearchObject>::search_config(),
88+
),
89+
(
90+
"trainschedule",
91+
<SearchResultItemTrainSchedule as editoast_search::SearchObject>::search_config(),
92+
),
93+
])
7694
}
7795
}
7896
#[derive(Serialize, ToSchema)]

0 commit comments

Comments
 (0)