fix wasm compat

tamasfe · Aug 13, 2023 · 4a88c76 · 4a88c76
1 parent 1acbc29
commit 4a88c76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/crates/taplo-cli/src/lib.rs b/crates/taplo-cli/src/lib.rs
@@ -5,12 +5,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use taplo_common::{
-    config::Config,
-    environment::Environment,
-    schema::Schemas,
-    util::{get_reqwest_client, Normalize},
-};
+use taplo_common::{config::Config, environment::Environment, schema::Schemas, util::Normalize};
 
 pub mod args;
 pub mod commands;
@@ -26,7 +21,8 @@ pub struct Taplo<E: Environment> {
 impl<E: Environment> Taplo<E> {
     pub fn new(env: E) -> Self {
         #[cfg(not(target_arch = "wasm32"))]
-        let http = get_reqwest_client(std::time::Duration::from_secs(5)).unwrap();
+        let http =
+            taplo_common::util::get_reqwest_client(std::time::Duration::from_secs(5)).unwrap();
 
         #[cfg(target_arch = "wasm32")]
         let http = reqwest::Client::default();

diff --git a/crates/taplo-common/src/util.rs b/crates/taplo-common/src/util.rs
@@ -121,6 +121,7 @@ pub(crate) fn normalize_str(s: &str) -> Cow<str> {
     }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 #[tracing::instrument]
 pub fn get_reqwest_client(timeout: std::time::Duration) -> Result<reqwest::Client, reqwest::Error> {
     fn get_cert(path: impl AsRef<Path>) -> Result<reqwest::Certificate, anyhow::Error> {

diff --git a/crates/taplo-lsp/src/world.rs b/crates/taplo-lsp/src/world.rs
@@ -18,7 +18,6 @@ use taplo_common::{
         associations::{priority, source, AssociationRule, SchemaAssociation},
         Schemas,
     },
-    util::get_reqwest_client,
     AsyncRwLock, HashMap, IndexMap,
 };
 
@@ -125,7 +124,7 @@ impl<E: Environment> WorkspaceState<E> {
 
         #[cfg(not(target_arch = "wasm32"))]
         {
-            client = get_reqwest_client(Duration::from_secs(10)).unwrap();
+            client = taplo_common::util::get_reqwest_client(Duration::from_secs(10)).unwrap();
         }
 
         Self {