fix small codesmells in websearch

Author: Kn4ughty

src/websearch/mod.rs

@@ -19,7 +19,7 @@ pub struct Web {
     cached_results: HashMap<String, Vec<SearchResult>>,
 
     // The memory cost of this isnt actually that bad. Each image is just a couple kB each since
-    // they are very small thumbnails. It only increased a few mB over like 10s of useage
+    // they are very small thumbnails. It only increased a few mB over like 10s of usage
     image_hashmap: HashMap<String, widget::image::Handle>,
     client: reqwest::Client,
 }
@@ -60,14 +60,18 @@ impl Web {
         match (first, search_text) {
             // get first char
             (Some('w'), search_text) => {
-                log::info!("wikipedia time!");
+                log::debug!("wikipedia time!");
                 let client = self.client.clone();
 
                 let full_text = self.input_for_results.clone();
                 // trim first character. TODO. Dont hardcode
                 let trimmed_text = search_text[1..].to_owned();
                 Task::perform(
-                    async move { wikipedia::search(&client, trimmed_text.as_str(), full_text).await },
+                    async move {
+                        let res = wikipedia::search(&client, trimmed_text.as_str()).await;
+                        // this little tuple maneuver is cool
+                        (full_text, res)
+                    },
                     |r| ModuleMessage::WebMessage(WebMsg::GotResult(r.0, r.1)),
                 )
             }

src/websearch/wikipedia.rs

@@ -38,31 +38,28 @@ impl From<WikiResultSingle> for SearchResult {
 pub async fn search(
     client: &reqwest::Client,
     search_text: &str,
-    full_text: String,
-) -> (String, Result<Vec<SearchResult>, SearchError>) {
+) -> Result<Vec<SearchResult>, SearchError> {
     let url =
         format!("https://en.wikipedia.org/w/rest.php/v1/search/title?q={search_text}&limit=5");
-    let req_result = async |url| -> Result<Vec<SearchResult>, SearchError> {
-        {
-            let response =
-                client.get(url).send().await.map_err(|e| {
-                    SearchError::BadResponse(format!("failed to get response: {}", e))
-                })?;
 
-            let text = response
-                .text()
-                .await
-                .map_err(|e| SearchError::BadResponse(format!("failed to get text: {}", e)))?;
-            log::trace!("text found from wikipedia: {}", text);
-            let data: WikiResults = serde_json::from_str(&text).map_err(|e| {
-                SearchError::BadResponse(format!("failed to parse from json: {}", e))
-            })?;
+    let response = client
+        .get(url)
+        .send()
+        .await
+        .map_err(|e| SearchError::BadResponse(format!("failed to get response: {}", e)))?;
 
-            let parsed = data.pages.into_iter().map(|result| result.into()).collect();
-            log::debug!("parsed text from wikipedia: {:#?}", parsed);
-            Ok(parsed)
-        }
-    };
+    let text = response
+        .text()
+        .await
+        .map_err(|e| SearchError::BadResponse(format!("failed to get text: {}", e)))?;
+
+    log::trace!("text found from wikipedia: {}", text);
+
+    let data: WikiResults = serde_json::from_str(&text)
+        .map_err(|e| SearchError::BadResponse(format!("failed to parse from json: {}", e)))?;
+
+    let parsed = data.pages.into_iter().map(|result| result.into()).collect();
+    log::debug!("parsed text from wikipedia: {:#?}", parsed);
 
-    (full_text, req_result(url).await)
+    Ok(parsed)
 }