Fix dunce usage

src-tauri/grpc/src/proto.rs

@@ -4,22 +4,22 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
 use anyhow::anyhow;
-use hyper::client::HttpConnector;
 use hyper::Client;
+use hyper::client::HttpConnector;
 use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
 use log::{debug, warn};
 use prost::Message;
 use prost_reflect::{DescriptorPool, MethodDescriptor};
 use prost_types::{FileDescriptorProto, FileDescriptorSet};
-use tauri::path::BaseDirectory;
 use tauri::{AppHandle, Manager};
+use tauri::path::BaseDirectory;
 use tauri_plugin_shell::ShellExt;
 use tokio::fs;
 use tokio_stream::StreamExt;
 use tonic::body::BoxBody;
 use tonic::codegen::http::uri::PathAndQuery;
-use tonic::transport::Uri;
 use tonic::Request;
+use tonic::transport::Uri;
 use tonic_reflection::pb::server_reflection_client::ServerReflectionClient;
 use tonic_reflection::pb::server_reflection_request::MessageRequest;
 use tonic_reflection::pb::server_reflection_response::MessageResponse;
@@ -38,12 +38,10 @@ pub async fn fill_pool_from_files(
         .expect("failed to resolve protoc include directory");
 
     // HACK: Remove UNC prefix for Windows paths
-    let global_import_dir = dunce::simplified(&Path::from(global_import_dir))
-        .to_string_lossy()
-        .to_string();
-    let desc_path = dunce::simplified(&Path::from(desc_path))
+    let global_import_dir = dunce::simplified(global_import_dir.as_path())
         .to_string_lossy()
         .to_string();
+    let desc_path = dunce::simplified(desc_path.as_path());
 
     let mut args = vec![
         "--include_imports".to_string(),
@@ -51,7 +49,7 @@ pub async fn fill_pool_from_files(
         "-I".to_string(),
         global_import_dir,
         "-o".to_string(),
-        desc_path,
+        desc_path.to_string_lossy().to_string(),
     ];
 
     for p in paths {
@@ -89,14 +87,12 @@ pub async fn fill_pool_from_files(
         ));
     }
 
-    let bytes = fs::read(desc_path.as_path())
-        .await
-        .map_err(|e| e.to_string())?;
+    let bytes = fs::read(desc_path).await.map_err(|e| e.to_string())?;
     let fdp = FileDescriptorSet::decode(bytes.deref()).map_err(|e| e.to_string())?;
     pool.add_file_descriptor_set(fdp)
         .map_err(|e| e.to_string())?;
 
-    fs::remove_file(desc_path.as_path())
+    fs::remove_file(desc_path)
         .await
         .map_err(|e| e.to_string())?;
 

src-tauri/tauri-plugin-plugin-runtime/src/nodejs.rs

@@ -7,8 +7,8 @@ use log::{debug, info};
 use rand::distributions::{Alphanumeric, DistString};
 use serde;
 use serde::Deserialize;
-use tauri::path::BaseDirectory;
 use tauri::{AppHandle, Manager, Runtime};
+use tauri::path::BaseDirectory;
 use tauri_plugin_shell::ShellExt;
 use tokio::fs;
 
@@ -39,10 +39,10 @@ pub async fn node_start<R: Runtime>(app: &AppHandle<R>, temp_dir: &PathBuf) -> S
 
     // HACK: Remove UNC prefix for Windows paths to pass to sidecar
 
-    let plugins_dir = dunce::simplified(&Path::from(plugins_dir))
+    let plugins_dir = dunce::simplified(plugins_dir.as_path())
         .to_string_lossy()
         .to_string();
-    let plugin_runtime_main = dunce::simplified(&Path::from(plugin_runtime_main))
+    let plugin_runtime_main = dunce::simplified(plugin_runtime_main.as_path())
         .to_string_lossy()
         .to_string();
 

src-tauri/tauri.conf.json

@@ -59,15 +59,7 @@
       "../plugin-runtime/build": "plugin-runtime"
     },
     "shortDescription": "Play with APIs, intuitively",
-    "targets": [
-      "deb",
-      "rpm",
-      "appimage",
-      "nsis",
-      "app",
-      "dmg",
-      "updater"
-    ],
+    "targets": "all",
     "iOS": {
       "developmentTeam": "7PU3P6ELJ8"
     },