Skip to content

Commit be6b796

Browse files
committed
change several apis
1 parent 61f814b commit be6b796

File tree

1 file changed

+27
-22
lines changed

1 file changed

+27
-22
lines changed

src/url_search_params.rs

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,24 @@ impl URLSearchParams {
2626
/// ```
2727
/// use ada_url::URLSearchParams;
2828
/// let params = URLSearchParams::parse("a=1&b=2");
29-
/// assert_eq!(params.size(), 2);
29+
/// assert_eq!(params.len(), 2);
3030
/// ```
31-
pub fn size(&self) -> usize {
31+
pub fn len(&self) -> usize {
3232
unsafe { ffi::ada_search_params_size(self.0) }
3333
}
3434

35+
/// Returns true if no entries exist in the URLSearchParams.
36+
pub fn is_empty(&self) -> bool {
37+
self.len() == 0
38+
}
39+
3540
/// Sorts the keys of the URLSearchParams struct.
36-
pub fn sort(&self) {
41+
pub fn sort(&mut self) {
3742
unsafe { ffi::ada_search_params_sort(self.0) }
3843
}
3944

4045
/// Appends a key/value to the URLSearchParams struct.
41-
pub fn append(&self, key: &str, value: &str) {
46+
pub fn append(&mut self, key: &str, value: &str) {
4247
unsafe {
4348
ffi::ada_search_params_append(
4449
self.0,
@@ -50,16 +55,16 @@ impl URLSearchParams {
5055
}
5156
}
5257

53-
/// Removes all keys pre-existing keys from the URLSearchParams struct
58+
/// Removes all pre-existing keys from the URLSearchParams struct
5459
/// and appends the new key/value.
5560
///
5661
/// ```
5762
/// use ada_url::URLSearchParams;
58-
/// let params = URLSearchParams::parse("a=1&b=2");
63+
/// let mut params = URLSearchParams::parse("a=1&b=2");
5964
/// params.set("a", "3");
6065
/// assert_eq!(params.get("a"), Some("3"));
6166
/// ```
62-
pub fn set(&self, key: &str, value: &str) {
67+
pub fn set(&mut self, key: &str, value: &str) {
6368
unsafe {
6469
ffi::ada_search_params_set(
6570
self.0,
@@ -77,11 +82,11 @@ impl URLSearchParams {
7782
///
7883
/// ```
7984
/// use ada_url::URLSearchParams;
80-
/// let params = URLSearchParams::parse("a=1&b=2");
85+
/// let mut params = URLSearchParams::parse("a=1&b=2");
8186
/// params.remove("a", Some("1"));
8287
/// assert_eq!(params.get("a"), None);
8388
/// ```
84-
pub fn remove(&self, key: &str, value: Option<&str>) {
89+
pub fn remove(&mut self, key: &str, value: Option<&str>) {
8590
if let Some(value) = value {
8691
unsafe {
8792
ffi::ada_search_params_remove_value(
@@ -97,14 +102,14 @@ impl URLSearchParams {
97102
}
98103
}
99104

100-
/// Retruns true if the URLSearchParams struct contains the key.
105+
/// Returns whether the [`URLSearchParams`] contains the `key`.
101106
///
102107
/// ```
103108
/// use ada_url::URLSearchParams;
104109
/// let params = URLSearchParams::parse("a=1&b=2");
105-
/// assert_eq!(params.has("a", None), true);
110+
/// assert_eq!(params.contains("a", None), true);
106111
/// ```
107-
pub fn has(&self, key: &str, value: Option<&str>) -> bool {
112+
pub fn contains(&self, key: &str, value: Option<&str>) -> bool {
108113
if let Some(value) = value {
109114
unsafe {
110115
ffi::ada_search_params_has_value(
@@ -158,7 +163,7 @@ impl URLSearchParams {
158163
/// use ada_url::URLSearchParams;
159164
/// let params = URLSearchParams::parse("a=1&a=2");
160165
/// let pairs = params.get_all("a");
161-
/// assert_eq!(pairs.get_size(), 2);
166+
/// assert_eq!(pairs.len(), 2);
162167
/// ```
163168
pub fn get_all(&self, key: &str) -> URLSearchParamsEntry {
164169
unsafe {
@@ -173,9 +178,9 @@ impl URLSearchParams {
173178
/// ```
174179
/// use ada_url::URLSearchParams;
175180
/// let params = URLSearchParams::parse("a=1");
176-
/// let mut keys = params.get_keys();
181+
/// let mut keys = params.keys();
177182
/// assert!(keys.has_next());
178-
pub fn get_keys(&self) -> URLSearchParamsKeysIterator {
183+
pub fn keys(&self) -> URLSearchParamsKeysIterator {
179184
let iterator = unsafe { ffi::ada_search_params_get_keys(self.0) };
180185
URLSearchParamsKeysIterator::new(iterator)
181186
}
@@ -185,9 +190,9 @@ impl URLSearchParams {
185190
/// ```
186191
/// use ada_url::URLSearchParams;
187192
/// let params = URLSearchParams::parse("a=1");
188-
/// let mut values = params.get_values();
193+
/// let mut values = params.values();
189194
/// assert!(values.has_next());
190-
pub fn get_values(&self) -> URLSearchParamsValuesIterator {
195+
pub fn values(&self) -> URLSearchParamsValuesIterator {
191196
let iterator = unsafe { ffi::ada_search_params_get_values(self.0) };
192197
URLSearchParamsValuesIterator::new(iterator)
193198
}
@@ -211,7 +216,7 @@ impl URLSearchParamsKeysIterator<'_> {
211216
}
212217

213218
/// Returns a new value if it's available
214-
pub fn get_next(&self) -> Option<&str> {
219+
pub fn get_next(&mut self) -> Option<&str> {
215220
if self.has_next() {
216221
return None;
217222
}
@@ -258,7 +263,7 @@ impl URLSearchParamsValuesIterator<'_> {
258263
}
259264

260265
/// Returns a new value if it's available
261-
pub fn get_next(&self) -> Option<&str> {
266+
pub fn get_next(&mut self) -> Option<&str> {
262267
if self.has_next() {
263268
return None;
264269
}
@@ -300,9 +305,9 @@ impl<'a> URLSearchParamsEntry<'a> {
300305
/// use ada_url::URLSearchParams;
301306
/// let params = URLSearchParams::parse("a=1&b=2");
302307
/// let pairs = params.get_all("a");
303-
/// assert_eq!(pairs.get_size(), 1);
308+
/// assert_eq!(pairs.len(), 1);
304309
/// ```
305-
pub fn get_size(&self) -> usize {
310+
pub fn len(&self) -> usize {
306311
self.size
307312
}
308313

@@ -312,7 +317,7 @@ impl<'a> URLSearchParamsEntry<'a> {
312317
/// use ada_url::URLSearchParams;
313318
/// let params = URLSearchParams::parse("a=1&a=2");
314319
/// let pairs = params.get_all("a");
315-
/// assert_eq!(pairs.get_size(), 2);
320+
/// assert_eq!(pairs.len(), 2);
316321
/// assert_eq!(pairs.get(0), Some("1"));
317322
/// assert_eq!(pairs.get(1), Some("2"));
318323
/// assert_eq!(pairs.get(2), None);

0 commit comments

Comments
 (0)