upload: apply (some) reccomendations from `cargo clippy`

upload/src/main.rs

···
 
   // get local site info
   let local_sitemap = sitemap::local_sitemap(config.dir, config.all_files, config.git_ignore)
-    .or_else(|err| {
+    .map_err(|err| {
       println!("Sitemap Error: {}", err);
-      Err(())
     })?;
 
   // create session
···
       .xrpc(agent.endpoint().await)
       .send::<ListRecords>(&req)
       .await
-      .or_else(|err| {
+      .map_err(|err| {
         println!("Error fetching records: {err}");
-        Err(())
       })?
       .into_output()
-      .or_else(|err| {
+      .map_err(|err| {
         println!("Error fetching records: {err}");
-        Err(())
       })?;
 
     for record in res.records {
···
         panic!("Impossible state")
       }
     };
-    let blob = fs::read(blob).or_else(|err| {
+    let blob = fs::read(blob).map_err(|err| {
       println!("FS error: {err}");
-      Err(())
     })?;
     let res = agent
       .upload_blob(blob, v.mime_type.clone().into())
       .await
-      .or_else(|err| {
+      .map_err(|err| {
         println!("Blob upload error: {err}");
-        Err(())
       })?;
     new_sitemap.insert(
       k,

upload/src/sitemap.rs

···
   }
 }
 
-pub fn local_sitemap<'a>(
+pub fn local_sitemap(
   dir: PathBuf,
   include_dotfiles: bool,
   use_gitignore: bool,
···
     // etc
     let key = file.path().canonicalize()?;
     let key = key.strip_prefix(&prefix)?;
-    let key = String::from(key.to_str().ok_or_else(|| SitemapErr::NotUTF8Path)?);
+    let key = String::from(key.to_str().ok_or(SitemapErr::NotUTF8Path)?);
 
     let mime = mime_guess::from_path(&key);
     let mime = mime.first().unwrap_or(mime::APPLICATION_OCTET_STREAM);

upload/src/utils.rs

···
     .replace(":3D", "=")
     .replace(":40", "@");
 
-  return Some(res);
+  Some(res)
 }
 
 pub fn url_to_rkey(url: String) -> Option<String> {
···
     .replace("=", ":3D")
     .replace("@", ":40");
 
-  return Some(res);
+  Some(res)
 }