Skip to content

Commit 53bd239

Browse files
oguzkoceroguzkocer
authored
Don't require importing AsQueryValue from impl_as_query_value_from_to_string (#541)
1 parent c54ee37 commit 53bd239

13 files changed

+40
-62
lines changed

‎wp_api/src/categories.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
use std::{num::ParseIntError, str::FromStr};
2-
3-
use serde::{Deserialize, Serialize};
4-
use strum_macros::IntoStaticStr;
5-
use wp_contextual::WpContextual;
6-
71
use crate::{
82
impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
93
posts::PostId,
104
taxonomies::TaxonomyType,
115
url_query::{
12-
AppendUrlQueryPairs, AsQueryValue, FromUrlQueryPairs, QueryPairs, QueryPairsExtension,
13-
UrlQueryPairsMap,
6+
AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
147
},
158
WpApiParamOrder,
169
};
10+
use serde::{Deserialize, Serialize};
11+
use std::{num::ParseIntError, str::FromStr};
12+
use strum_macros::IntoStaticStr;
13+
use wp_contextual::WpContextual;
1714

1815
impl_as_query_value_for_new_type!(CategoryId);
1916
uniffi::custom_newtype!(CategoryId, i64);

‎wp_api/src/comments.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
use std::{collections::HashMap, num::ParseIntError, str::FromStr};
2-
3-
use serde::{Deserialize, Serialize};
4-
use strum_macros::IntoStaticStr;
5-
use wp_contextual::WpContextual;
6-
71
use crate::{
82
impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
93
posts::PostId,
104
url_query::{
11-
AppendUrlQueryPairs, AsQueryValue, FromUrlQueryPairs, QueryPairs, QueryPairsExtension,
12-
UrlQueryPairsMap,
5+
AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
136
},
147
UserAvatarSize, UserId, WpApiParamOrder, WpResponseString,
158
};
9+
use serde::{Deserialize, Serialize};
10+
use std::{collections::HashMap, num::ParseIntError, str::FromStr};
11+
use strum_macros::IntoStaticStr;
12+
use wp_contextual::WpContextual;
1613

1714
#[derive(
1815
Debug,

‎wp_api/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ pub use parsed_url::{ParseUrlError, ParsedUrl};
99
use plugins::*;
1010
use serde::{Deserialize, Serialize};
1111
use std::collections::HashMap;
12-
use url_query::AsQueryValue;
1312
use users::*;
1413
pub use uuid::{WpUuid, WpUuidParseError};
1514

‎wp_api/src/media.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ use crate::{
55
WpApiParamPostsSearchColumn,
66
},
77
url_query::{
8-
AppendUrlQueryPairs, AsQueryValue, FromUrlQueryPairs, QueryPairs, QueryPairsExtension,
9-
UrlQueryPairsMap,
8+
AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
109
},
1110
JsonValue, UserId, WpApiParamOrder,
1211
};

‎wp_api/src/plugins.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
use std::fmt::Display;
2-
3-
use serde::{Deserialize, Serialize};
4-
use wp_contextual::WpContextual;
5-
61
use crate::{
72
impl_as_query_value_from_to_string,
8-
url_query::{AppendUrlQueryPairs, AsQueryValue, QueryPairs, QueryPairsExtension},
3+
url_query::{AppendUrlQueryPairs, QueryPairs, QueryPairsExtension},
94
};
5+
use serde::{Deserialize, Serialize};
6+
use std::fmt::Display;
7+
use wp_contextual::WpContextual;
108

119
#[derive(Debug, Default, uniffi::Record)]
1210
pub struct PluginListParams {

‎wp_api/src/post_types.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
use std::collections::HashMap;
2-
31
use crate::impl_as_query_value_from_to_string;
4-
use crate::url_query::AsQueryValue;
52
use serde::{Deserialize, Serialize};
3+
use std::collections::HashMap;
64
use wp_contextual::WpContextual;
75

86
#[derive(

‎wp_api/src/posts.rs

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
use std::{num::ParseIntError, str::FromStr};
2-
3-
use serde::{Deserialize, Serialize};
4-
use strum_macros::IntoStaticStr;
5-
use wp_contextual::WpContextual;
6-
use wp_serde_helper::{deserialize_from_string_of_json_array, serialize_as_json_string};
7-
81
use crate::{
92
categories::CategoryId,
103
impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
114
media::MediaId,
125
tags::TagId,
136
url_query::{
14-
AppendUrlQueryPairs, AsQueryValue, FromUrlQueryPairs, QueryPairs, QueryPairsExtension,
15-
UrlQueryPairsMap,
7+
AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
168
},
179
UserId, WpApiParamOrder,
1810
};
11+
use serde::{Deserialize, Serialize};
12+
use std::{num::ParseIntError, str::FromStr};
13+
use strum_macros::IntoStaticStr;
14+
use wp_contextual::WpContextual;
15+
use wp_serde_helper::{deserialize_from_string_of_json_array, serialize_as_json_string};
1916

2017
#[derive(
2118
Debug,

‎wp_api/src/search_results.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
url_query::{
44
AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
55
},
6-
AsQueryValue, IntegerOrString,
6+
IntegerOrString,
77
};
88
use serde::{Deserialize, Serialize};
99
use strum_macros::IntoStaticStr;

‎wp_api/src/tags.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
use std::{num::ParseIntError, str::FromStr};
2-
3-
use serde::{Deserialize, Serialize};
4-
use strum_macros::IntoStaticStr;
5-
use wp_contextual::WpContextual;
6-
71
use crate::{
82
impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
93
posts::PostId,
104
taxonomies::TaxonomyType,
115
url_query::{
12-
AppendUrlQueryPairs, AsQueryValue, FromUrlQueryPairs, QueryPairs, QueryPairsExtension,
13-
UrlQueryPairsMap,
6+
AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
147
},
158
WpApiParamOrder,
169
};
10+
use serde::{Deserialize, Serialize};
11+
use std::{num::ParseIntError, str::FromStr};
12+
use strum_macros::IntoStaticStr;
13+
use wp_contextual::WpContextual;
1714

1815
impl_as_query_value_for_new_type!(TagId);
1916
uniffi::custom_newtype!(TagId, i64);

‎wp_api/src/templates.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use crate::{
33
post_types::PostType,
44
posts::PostId,
55
url_query::{
6-
AppendUrlQueryPairs, AsQueryValue, FromUrlQueryPairs, QueryPairs, QueryPairsExtension,
7-
UrlQueryPairsMap,
6+
AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
87
},
98
UserId,
109
};

‎wp_api/src/themes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
url_query::{
44
AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
55
},
6-
AsQueryValue, BoolOrVecString,
6+
BoolOrVecString,
77
};
88
use serde::{Deserialize, Serialize};
99
use std::{collections::HashMap, fmt::Display};

‎wp_api/src/url_query.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ mod macro_helper {
159159
#[macro_export]
160160
macro_rules! impl_as_query_value_from_as_str {
161161
($ident: ident) => {
162-
impl AsQueryValue for $ident {
162+
impl $crate::url_query::AsQueryValue for $ident {
163163
fn as_query_value(&self) -> impl AsRef<str> {
164164
self.as_str()
165165
}
@@ -170,7 +170,7 @@ mod macro_helper {
170170
#[macro_export]
171171
macro_rules! impl_as_query_value_from_to_string {
172172
($ident: ident) => {
173-
impl AsQueryValue for $ident {
173+
impl $crate::url_query::AsQueryValue for $ident {
174174
fn as_query_value(&self) -> impl AsRef<str> {
175175
self.to_string()
176176
}
@@ -181,7 +181,7 @@ mod macro_helper {
181181
#[macro_export]
182182
macro_rules! impl_as_query_value_for_new_type {
183183
($ident: ident) => {
184-
impl AsQueryValue for $ident {
184+
impl $crate::url_query::AsQueryValue for $ident {
185185
fn as_query_value(&self) -> impl AsRef<str> {
186186
self.0.as_query_value()
187187
}

‎wp_api/src/users.rs

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
use std::{
2-
collections::HashMap, convert::Infallible, fmt::Display, num::ParseIntError, str::FromStr,
3-
};
4-
5-
use serde::{Deserialize, Serialize};
6-
use strum_macros::IntoStaticStr;
7-
use wp_contextual::WpContextual;
8-
91
use crate::{
102
impl_as_query_value_for_new_type, impl_as_query_value_from_to_string,
113
url_query::{
12-
AppendUrlQueryPairs, AsQueryValue, FromUrlQueryPairs, QueryPairs, QueryPairsExtension,
13-
UrlQueryPairsMap,
4+
AppendUrlQueryPairs, FromUrlQueryPairs, QueryPairs, QueryPairsExtension, UrlQueryPairsMap,
145
},
156
EnumFromStrParsingError, OptionFromStr, WpApiParamOrder, WpResponseString,
167
};
8+
use serde::{Deserialize, Serialize};
9+
use std::{
10+
collections::HashMap, convert::Infallible, fmt::Display, num::ParseIntError, str::FromStr,
11+
};
12+
use strum_macros::IntoStaticStr;
13+
use wp_contextual::WpContextual;
1714

1815
#[derive(
1916
Debug,

0 commit comments

Comments
 (0)