Skip to content

Commit 3f6a734

Browse files
Suficiosyphar
authored andcommitted
Remove optional query params
1 parent 8ede7dc commit 3f6a734

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/registry_api.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ impl RegistryApi {
249249
}
250250

251251
/// Fetch crates from the registry's API
252-
pub(crate) async fn get_crates(&self, query: Option<&str>) -> Result<Search> {
252+
pub(crate) async fn search(&self, query_params: &str) -> Result<Search> {
253253
#[derive(Deserialize, Debug)]
254254
struct SearchError {
255255
detail: String,
@@ -267,7 +267,7 @@ impl RegistryApi {
267267
url.path_segments_mut()
268268
.map_err(|()| anyhow!("Invalid API url"))?
269269
.extend(&["api", "v1", "crates"]);
270-
url.set_query(query);
270+
url.set_query(Some(query_params));
271271
url
272272
};
273273

src/web/releases.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@ struct SearchResult {
143143
async fn get_search_results(
144144
conn: &mut sqlx::PgConnection,
145145
registry: &RegistryApi,
146-
query_params: Option<&str>,
146+
query_params: &str,
147147
) -> Result<SearchResult, anyhow::Error> {
148148
let crate::registry_api::Search {
149149
crates,
150150
meta,
151151
executed_query,
152-
} = registry.get_crates(query_params).await?;
152+
} = registry.search(query_params).await?;
153153

154154
let names = Arc::new(
155155
crates
@@ -602,15 +602,15 @@ pub(crate) async fn search_handler(
602602
sort_by = v;
603603
};
604604

605-
get_search_results(&mut conn, &registry, Some(query_params)).await?
605+
get_search_results(&mut conn, &registry, query_params).await?
606606
} else if !query.is_empty() {
607607
let query_params: String = form_urlencoded::Serializer::new(String::new())
608608
.append_pair("q", &query)
609609
.append_pair("sort", &sort_by)
610610
.append_pair("per_page", &RELEASES_IN_RELEASES.to_string())
611611
.finish();
612612

613-
get_search_results(&mut conn, &registry, Some(&query_params)).await?
613+
get_search_results(&mut conn, &registry, &query_params).await?
614614
} else {
615615
return Err(AxumNope::NoResults);
616616
};

0 commit comments

Comments
 (0)