From fecbc767bb5980e4213503e2317903aafd79d3ba Mon Sep 17 00:00:00 2001 From: amrbashir Date: Thu, 4 Apr 2024 02:46:42 +0200 Subject: [PATCH 01/10] refactor(cli&bundler): avoid renaming main executable and reserve cargo name closes #8109 closes #8349 --- .changes/cli-perserve-cargo-bin-name.md | 7 ++ .changes/tauri-utils-package-name-removed.md | 6 ++ Cargo.lock | 1 - core/tauri-runtime-wry/src/lib.rs | 6 +- core/tauri-utils/Cargo.toml | 3 - core/tauri-utils/src/config.rs | 17 ---- core/tauri-utils/src/lib.rs | 14 --- core/tauri-utils/src/platform.rs | 6 +- core/tauri/src/window/mod.rs | 11 +-- tooling/bundler/Cargo.toml | 1 - tooling/bundler/src/bundle/linux/debian.rs | 4 +- .../bundler/src/bundle/linux/freedesktop.rs | 2 +- tooling/bundler/src/bundle/settings.rs | 9 ++ tooling/bundler/src/bundle/windows/msi/wix.rs | 28 +++--- tooling/bundler/src/bundle/windows/nsis.rs | 20 ++--- tooling/cli/Cargo.lock | 2 - tooling/cli/src/interface/mod.rs | 8 +- tooling/cli/src/interface/rust.rs | 88 ++++--------------- tooling/cli/src/interface/rust/desktop.rs | 54 ------------ 19 files changed, 78 insertions(+), 209 deletions(-) create mode 100644 .changes/cli-perserve-cargo-bin-name.md create mode 100644 .changes/tauri-utils-package-name-removed.md diff --git a/.changes/cli-perserve-cargo-bin-name.md b/.changes/cli-perserve-cargo-bin-name.md new file mode 100644 index 000000000000..a991e3eea51f --- /dev/null +++ b/.changes/cli-perserve-cargo-bin-name.md @@ -0,0 +1,7 @@ +--- +"tauri-cli": "patch:breaking" +"@tauri-apps/cli": "patch:breaking" +--- + +Avoid renaming main binary to product name and perserve the name generated by cargo. + diff --git a/.changes/tauri-utils-package-name-removed.md b/.changes/tauri-utils-package-name-removed.md new file mode 100644 index 000000000000..bbb4ae14634c --- /dev/null +++ b/.changes/tauri-utils-package-name-removed.md @@ -0,0 +1,6 @@ +--- +"tauri-utils": "patch:breaking" +--- + +Removed `Config::binary_name` and `PackageInfo::package_name` + diff --git a/Cargo.lock b/Cargo.lock index 20f33b24fa05..77e6ae609047 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3686,7 +3686,6 @@ dependencies = [ "dunce", "getrandom 0.2.12", "glob", - "heck 0.4.1", "html5ever", "infer", "json-patch", diff --git a/core/tauri-runtime-wry/src/lib.rs b/core/tauri-runtime-wry/src/lib.rs index 983076e1a48f..76e93a37b8e0 100644 --- a/core/tauri-runtime-wry/src/lib.rs +++ b/core/tauri-runtime-wry/src/lib.rs @@ -4105,8 +4105,10 @@ fn calculate_window_center_position( { use tao::platform::windows::MonitorHandleExtWindows; use windows::Win32::Graphics::Gdi::{GetMonitorInfoW, HMONITOR, MONITORINFO}; - let mut monitor_info = MONITORINFO::default(); - monitor_info.cbSize = std::mem::size_of::() as u32; + let mut monitor_info = MONITORINFO { + cbSize: std::mem::size_of::() as u32, + ..Default::default() + }; let status = unsafe { GetMonitorInfoW(HMONITOR(target_monitor.hmonitor()), &mut monitor_info) }; if status.into() { let available_width = monitor_info.rcWork.right - monitor_info.rcWork.left; diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml index 5f48e1c77d3b..904026006e7f 100644 --- a/core/tauri-utils/Cargo.toml +++ b/core/tauri-utils/Cargo.toml @@ -43,9 +43,6 @@ dunce = "1" log = "0.4.21" cargo_metadata = { version = "0.18", optional = true } -[target."cfg(target_os = \"linux\")".dependencies] -heck = "0.4" - [target."cfg(target_os = \"macos\")".dependencies] swift-rs = { version = "1.0.6", optional = true, features = [ "build" ] } diff --git a/core/tauri-utils/src/config.rs b/core/tauri-utils/src/config.rs index 3a63f38cc43f..7d58c3528be0 100644 --- a/core/tauri-utils/src/config.rs +++ b/core/tauri-utils/src/config.rs @@ -10,8 +10,6 @@ //! This is a core functionality that is not considered part of the stable API. //! If you use it, note that it may include breaking changes in the future. -#[cfg(target_os = "linux")] -use heck::ToKebabCase; #[cfg(feature = "schema")] use schemars::JsonSchema; use semver::Version; @@ -2056,21 +2054,6 @@ pub struct Config { pub plugins: PluginConfig, } -impl Config { - /// The binary name. Returns the product name as kebab-case on Linux, - /// and returns it as is on all other platforms. - pub fn binary_name(&self) -> Option { - #[cfg(target_os = "linux")] - { - self.product_name.as_ref().map(|n| n.to_kebab_case()) - } - #[cfg(not(target_os = "linux"))] - { - self.product_name.clone() - } - } -} - /// The plugin configs holds a HashMap mapping a plugin name to its configuration object. /// /// See more: diff --git a/core/tauri-utils/src/lib.rs b/core/tauri-utils/src/lib.rs index 0cf8c62877d8..d397460696fb 100644 --- a/core/tauri-utils/src/lib.rs +++ b/core/tauri-utils/src/lib.rs @@ -57,20 +57,6 @@ pub struct PackageInfo { pub crate_name: &'static str, } -impl PackageInfo { - /// Returns the application package name. - /// On macOS and Windows it's the `name` field, and on Linux it's the `name` in `kebab-case`. - pub fn package_name(&self) -> String { - #[cfg(target_os = "linux")] - { - use heck::ToKebabCase; - self.name.clone().to_kebab_case() - } - #[cfg(not(target_os = "linux"))] - self.name.clone() - } -} - #[allow(deprecated)] mod window_effects { use super::*; diff --git a/core/tauri-utils/src/platform.rs b/core/tauri-utils/src/platform.rs index 5c3bc8e02603..8b16b99b417f 100644 --- a/core/tauri-utils/src/platform.rs +++ b/core/tauri-utils/src/platform.rs @@ -292,7 +292,7 @@ fn resource_dir_from>( res = if curr_dir.ends_with("/data/usr/bin") { // running from the deb bundle dir exe_dir - .join(format!("../lib/{}", package_info.package_name())) + .join(format!("../lib/{}", package_info.crate_name)) .canonicalize() .map_err(Into::into) } else if let Some(appdir) = &env.appdir { @@ -300,13 +300,13 @@ fn resource_dir_from>( Ok(PathBuf::from(format!( "{}/usr/lib/{}", appdir.display(), - package_info.package_name() + package_info.crate_name ))) } else { // running bundle Ok(PathBuf::from(format!( "/usr/lib/{}", - package_info.package_name() + package_info.crate_name ))) }; } diff --git a/core/tauri/src/window/mod.rs b/core/tauri/src/window/mod.rs index 9df2fc711516..ae14bfcc1274 100644 --- a/core/tauri/src/window/mod.rs +++ b/core/tauri/src/window/mod.rs @@ -1955,16 +1955,7 @@ tauri::Builder::default() .set_progress_bar(crate::runtime::ProgressBarState { status: progress_state.status, progress: progress_state.progress, - desktop_filename: Some(format!( - "{}.desktop", - heck::AsKebabCase( - self - .config() - .product_name - .as_deref() - .unwrap_or_else(|| self.package_info().crate_name) - ) - )), + desktop_filename: Some(format!("{}.desktop", self.package_info().crate_name)), }) .map_err(Into::into) } diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index 9932b3f6013b..ae434ce5d8af 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -63,7 +63,6 @@ plist = "1" regex = "1" [target."cfg(target_os = \"linux\")".dependencies] -heck = "0.4" ar = "0.9.0" md5 = "0.7.0" rpm = "0.14.0" diff --git a/tooling/bundler/src/bundle/linux/debian.rs b/tooling/bundler/src/bundle/linux/debian.rs index 1de9278db295..f931ace555fe 100644 --- a/tooling/bundler/src/bundle/linux/debian.rs +++ b/tooling/bundler/src/bundle/linux/debian.rs @@ -27,7 +27,6 @@ use super::{super::common, freedesktop}; use crate::Settings; use anyhow::Context; use flate2::{write::GzEncoder, Compression}; -use heck::AsKebabCase; use tar::HeaderMode; use walkdir::WalkDir; @@ -158,7 +157,8 @@ fn generate_control_file( // https://www.debian.org/doc/debian-policy/ch-controlfields.html let dest_path = control_dir.join("control"); let mut file = common::create_file(&dest_path)?; - writeln!(file, "Package: {}", AsKebabCase(settings.product_name()))?; + let package = heck::AsKebabCase(settings.product_name()); + writeln!(file, "Package: {}", package)?; writeln!(file, "Version: {}", settings.version_string())?; writeln!(file, "Architecture: {arch}")?; // Installed-Size must be divided by 1024, see https://www.debian.org/doc/debian-policy/ch-controlfields.html#installed-size diff --git a/tooling/bundler/src/bundle/linux/freedesktop.rs b/tooling/bundler/src/bundle/linux/freedesktop.rs index d5a0f83a31d4..09266e6ddfc4 100644 --- a/tooling/bundler/src/bundle/linux/freedesktop.rs +++ b/tooling/bundler/src/bundle/linux/freedesktop.rs @@ -80,7 +80,7 @@ pub fn list_icon_files( /// Generate the icon files and store them under the `data_dir`. pub fn copy_icon_files(settings: &Settings, data_dir: &Path) -> crate::Result> { - let icons = self::list_icon_files(settings, data_dir)?; + let icons = list_icon_files(settings, data_dir)?; for (icon, src) in &icons { common::copy_file(src, &icon.path)?; } diff --git a/tooling/bundler/src/bundle/settings.rs b/tooling/bundler/src/bundle/settings.rs index 235849a8fc76..07a4ee282bc6 100644 --- a/tooling/bundler/src/bundle/settings.rs +++ b/tooling/bundler/src/bundle/settings.rs @@ -559,6 +559,15 @@ impl BundleBinary { } } + /// Creates a new bundle binary with path. + pub fn with_path(name: String, main: bool, src_path: Option) -> Self { + Self { + name, + src_path, + main, + } + } + /// Sets the src path of the binary. #[must_use] pub fn set_src_path(mut self, src_path: Option) -> Self { diff --git a/tooling/bundler/src/bundle/windows/msi/wix.rs b/tooling/bundler/src/bundle/windows/msi/wix.rs index 99904599c2f1..02101f4a6386 100644 --- a/tooling/bundler/src/bundle/windows/msi/wix.rs +++ b/tooling/bundler/src/bundle/windows/msi/wix.rs @@ -21,7 +21,7 @@ use regex::Regex; use serde::{Deserialize, Serialize}; use std::{ collections::{BTreeMap, HashMap, HashSet}, - fs::{create_dir_all, read_to_string, remove_dir_all, rename, write, File}, + fs::{self, File}, io::Write, path::{Path, PathBuf}, process::Command, @@ -155,7 +155,7 @@ fn copy_icon(settings: &Settings, filename: &str, path: &Path) -> crate::Result< let base_dir = settings.project_out_directory(); let resource_dir = base_dir.join("resources"); - create_dir_all(&resource_dir)?; + fs::create_dir_all(&resource_dir)?; let icon_target_path = resource_dir.join(filename); let icon_path = std::env::current_dir()?.join(path); @@ -411,9 +411,9 @@ pub fn build_wix_app_installer( let output_path = settings.project_out_directory().join("wix").join(arch); if output_path.exists() { - remove_dir_all(&output_path)?; + fs::remove_dir_all(&output_path)?; } - create_dir_all(&output_path)?; + fs::create_dir_all(&output_path)?; let mut data = BTreeMap::new(); @@ -488,7 +488,7 @@ pub fn build_wix_app_installer( if license.ends_with(".rtf") { data.insert("license", to_json(license)); } else { - let license_contents = read_to_string(license)?; + let license_contents = fs::read_to_string(license)?; let license_rtf = format!( r#"{{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{{\fonttbl{{\f0\fnil\fcharset0 Calibri;}}}} {{\*\generator Riched20 10.0.18362}}\viewkind4\uc1 @@ -629,7 +629,7 @@ pub fn build_wix_app_installer( if let Some(path) = custom_template_path { handlebars - .register_template_string("main.wxs", read_to_string(path)?) + .register_template_string("main.wxs", fs::read_to_string(path)?) .map_err(|e| e.to_string()) .expect("Failed to setup custom handlebar template"); } else { @@ -660,7 +660,7 @@ pub fn build_wix_app_installer( .expect("Failed to setup Update Task handlebars"); let temp_xml_path = output_path.join("update.xml"); let update_content = skip_uac_task.render("update.xml", &data)?; - write(temp_xml_path, update_content)?; + fs::write(temp_xml_path, update_content)?; // Create the Powershell script to install the task let mut skip_uac_task_installer = Handlebars::new(); @@ -672,7 +672,7 @@ pub fn build_wix_app_installer( .expect("Failed to setup Update Task Installer handlebars"); let temp_ps1_path = output_path.join("install-task.ps1"); let install_script_content = skip_uac_task_installer.render("install-task.ps1", &data)?; - write(temp_ps1_path, install_script_content)?; + fs::write(temp_ps1_path, install_script_content)?; // Create the Powershell script to uninstall the task let mut skip_uac_task_uninstaller = Handlebars::new(); @@ -684,13 +684,13 @@ pub fn build_wix_app_installer( .expect("Failed to setup Update Task Uninstaller handlebars"); let temp_ps1_path = output_path.join("uninstall-task.ps1"); let install_script_content = skip_uac_task_uninstaller.render("uninstall-task.ps1", &data)?; - write(temp_ps1_path, install_script_content)?; + fs::write(temp_ps1_path, install_script_content)?; data.insert("enable_elevated_update_task", to_json(true)); } let main_wxs_path = output_path.join("main.wxs"); - write(main_wxs_path, handlebars.render("main.wxs", &data)?)?; + fs::write(main_wxs_path, handlebars.render("main.wxs", &data)?)?; let mut candle_inputs = vec![("main.wxs".into(), Vec::new())]; @@ -698,7 +698,7 @@ pub fn build_wix_app_installer( let extension_regex = Regex::new("\"http://schemas.microsoft.com/wix/(\\w+)\"")?; for fragment_path in fragment_paths { let fragment_path = current_dir.join(fragment_path); - let fragment = read_to_string(&fragment_path)?; + let fragment = fs::read_to_string(&fragment_path)?; let mut extensions = Vec::new(); for cap in extension_regex.captures_iter(&fragment) { extensions.push(wix_toolset_path.join(format!("Wix{}.dll", &cap[1]))); @@ -734,7 +734,7 @@ pub fn build_wix_app_installer( }); let locale_contents = match language_config.locale_path { - Some(p) => read_to_string(p)?, + Some(p) => fs::read_to_string(p)?, None => format!( r#""#, language.to_lowercase(), @@ -786,7 +786,7 @@ pub fn build_wix_app_installer( let msi_output_path = output_path.join("output.msi"); let msi_path = app_installer_output_path(settings, &language, settings.version_string(), updater)?; - create_dir_all(msi_path.parent().unwrap())?; + fs::create_dir_all(msi_path.parent().unwrap())?; log::info!(action = "Running"; "light to produce {}", display_path(&msi_path)); @@ -797,7 +797,7 @@ pub fn build_wix_app_installer( &(fragment_extensions.clone().into_iter().collect()), &msi_output_path, )?; - rename(&msi_output_path, &msi_path)?; + fs::rename(&msi_output_path, &msi_path)?; try_sign(&msi_path, settings)?; output_paths.push(msi_path); } diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs index 5179e37f1273..8483452d5866 100644 --- a/tooling/bundler/src/bundle/windows/nsis.rs +++ b/tooling/bundler/src/bundle/windows/nsis.rs @@ -23,7 +23,7 @@ use tauri_utils::config::{NSISInstallerMode, NsisCompression, WebviewInstallMode use std::{ collections::{BTreeMap, HashMap}, - fs::{copy, create_dir_all, remove_dir_all, rename, write}, + fs, path::{Path, PathBuf}, process::Command, }; @@ -93,7 +93,7 @@ pub fn bundle_project(settings: &Settings, updater: bool) -> crate::Result c let data = download_and_verify(NSIS_URL, NSIS_SHA1, HashAlgorithm::Sha1)?; log::info!("extracting NSIS"); extract_zip(&data, _tauri_tools_path)?; - rename(_tauri_tools_path.join("nsis-3.08"), nsis_toolset_path)?; + fs::rename(_tauri_tools_path.join("nsis-3.08"), nsis_toolset_path)?; } let nsis_plugins = nsis_toolset_path.join("Plugins"); @@ -119,9 +119,9 @@ fn get_and_extract_nsis(nsis_toolset_path: &Path, _tauri_tools_path: &Path) -> c log::info!("extracting NSIS ApplicationID plugin"); extract_zip(&data, &nsis_plugins)?; - create_dir_all(nsis_plugins.join("x86-unicode"))?; + fs::create_dir_all(nsis_plugins.join("x86-unicode"))?; - copy( + fs::copy( nsis_plugins .join("ReleaseUnicode") .join("ApplicationID.dll"), @@ -133,7 +133,7 @@ fn get_and_extract_nsis(nsis_toolset_path: &Path, _tauri_tools_path: &Path) -> c NSIS_TAURI_UTILS_SHA1, HashAlgorithm::Sha1, )?; - write( + fs::write( nsis_plugins .join("x86-unicode") .join("nsis_tauri_utils.dll"), @@ -187,9 +187,9 @@ fn build_nsis_app_installer( let output_path = settings.project_out_directory().join("nsis").join(arch); if output_path.exists() { - remove_dir_all(&output_path)?; + fs::remove_dir_all(&output_path)?; } - create_dir_all(&output_path)?; + fs::create_dir_all(&output_path)?; let mut data = BTreeMap::new(); @@ -486,7 +486,7 @@ fn build_nsis_app_installer( }, package_base_name )); - create_dir_all(nsis_installer_path.parent().unwrap())?; + fs::create_dir_all(nsis_installer_path.parent().unwrap())?; log::info!(action = "Running"; "makensis.exe to produce {}", display_path(&nsis_installer_path)); @@ -509,7 +509,7 @@ fn build_nsis_app_installer( .piped() .context("error running makensis.exe")?; - rename(nsis_output_path, &nsis_installer_path)?; + fs::rename(nsis_output_path, &nsis_installer_path)?; // Code signing is currently only supported on Windows hosts #[cfg(target_os = "windows")] diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index e19bff426c72..299dd4d60d5e 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -4866,7 +4866,6 @@ dependencies = [ "flate2", "glob", "handlebars 5.1.0", - "heck 0.4.1", "hex", "image", "log", @@ -5023,7 +5022,6 @@ dependencies = [ "dunce", "getrandom 0.2.12", "glob", - "heck 0.4.1", "html5ever", "infer 0.15.0", "json-patch", diff --git a/tooling/cli/src/interface/mod.rs b/tooling/cli/src/interface/mod.rs index 29f5b9ae71d9..8979675cbde3 100644 --- a/tooling/cli/src/interface/mod.rs +++ b/tooling/cli/src/interface/mod.rs @@ -31,11 +31,7 @@ pub trait AppSettings { features: &[String], ) -> crate::Result; fn app_binary_path(&self, options: &Options) -> crate::Result; - fn get_binaries( - &self, - config: &Config, - target: &str, - ) -> crate::Result>; + fn get_binaries(&self, target: &str) -> crate::Result>; fn app_name(&self) -> Option; fn lib_name(&self) -> Option; @@ -61,7 +57,7 @@ pub trait AppSettings { SettingsBuilder::new() .package_settings(self.get_package_settings()) .bundle_settings(self.get_bundle_settings(config, &enabled_features)?) - .binaries(self.get_binaries(config, &target)?) + .binaries(self.get_binaries(&target)?) .project_out_directory(out_dir) .target(target) .package_types(package_types) diff --git a/tooling/cli/src/interface/rust.rs b/tooling/cli/src/interface/rust.rs index 1eea9b54d7f7..6786a07b2e32 100644 --- a/tooling/cli/src/interface/rust.rs +++ b/tooling/cli/src/interface/rust.rs @@ -16,7 +16,6 @@ use std::{ use anyhow::Context; use glob::glob; -use heck::ToKebabCase; use ignore::gitignore::{Gitignore, GitignoreBuilder}; use notify::RecursiveMode; use notify_debouncer_mini::new_debouncer; @@ -101,7 +100,6 @@ pub struct RustupTarget { pub struct Rust { app_settings: Arc, config_features: Vec, - product_name: Option, available_targets: Option>, } @@ -143,7 +141,6 @@ impl Interface for Rust { Ok(Self { app_settings: Arc::new(app_settings), config_features: config.build.features.clone().unwrap_or_default(), - product_name: config.product_name.clone(), available_targets: None, }) } @@ -156,7 +153,6 @@ impl Interface for Rust { desktop::build( options, &self.app_settings, - self.product_name.clone(), &mut self.available_targets, self.config_features.clone(), )?; @@ -479,7 +475,6 @@ impl Rust { &mut self.available_targets, self.config_features.clone(), &self.app_settings, - self.product_name.clone(), on_exit, ) .map(|c| Box::new(c) as Box) @@ -655,7 +650,7 @@ struct BinarySettings { #[serde(rename_all = "kebab-case")] pub struct CargoPackageSettings { /// the package's name. - pub name: Option, + pub name: String, /// the package's version. pub version: Option>, /// the package's description. @@ -831,11 +826,7 @@ impl AppSettings for RustAppSettings { } fn app_binary_path(&self, options: &Options) -> crate::Result { - let bin_name = self - .cargo_package_settings() - .name - .clone() - .expect("Cargo manifest must have the `package.name` field"); + let bin_name = self.cargo_package_settings().name.clone(); let out_dir = self .out_dir(options.target.clone(), get_profile_dir(options).to_string()) @@ -851,7 +842,7 @@ impl AppSettings for RustAppSettings { Ok(out_dir.join(bin_name).with_extension(binary_extension)) } - fn get_binaries(&self, config: &Config, target: &str) -> crate::Result> { + fn get_binaries(&self, target: &str) -> crate::Result> { let mut binaries: Vec = vec![]; let binary_extension: String = if target.contains("windows") { @@ -861,35 +852,17 @@ impl AppSettings for RustAppSettings { } .into(); - let target_os = target.split('-').nth(2).unwrap_or(std::env::consts::OS); - - if let Some(bin) = &self.cargo_settings.bin { + if let Some(bins) = &self.cargo_settings.bin { let default_run = self .package_settings .default_run .clone() .unwrap_or_default(); - for binary in bin { - binaries.push( - if Some(&binary.name) == self.cargo_package_settings.name.as_ref() - || binary.name.as_str() == default_run - { - BundleBinary::new( - format!( - "{}{}", - config.binary_name().unwrap_or_else(|| binary.name.clone()), - &binary_extension - ), - true, - ) - } else { - BundleBinary::new( - format!("{}{}", binary.name.clone(), &binary_extension), - false, - ) - } - .set_src_path(binary.path.clone()), - ) + for bin in bins { + let name = format!("{}{}", bin.name, binary_extension); + let is_main = + bin.name == self.cargo_package_settings.name || bin.name.as_str() == default_run; + binaries.push(BundleBinary::with_path(name, is_main, bin.path.clone())) } } @@ -913,38 +886,17 @@ impl AppSettings for RustAppSettings { } if let Some(default_run) = self.package_settings.default_run.as_ref() { - match binaries.iter_mut().find(|bin| bin.name() == default_run) { - Some(bin) => { - if let Some(bin_name) = config.binary_name() { - bin.set_name(bin_name); - } - } - None => { - binaries.push(BundleBinary::new( - format!( - "{}{}", - config - .binary_name() - .unwrap_or_else(|| default_run.to_string()), - &binary_extension - ), - true, - )); - } + if !binaries.iter_mut().any(|bin| bin.name() == default_run) { + binaries.push(BundleBinary::new( + format!("{}{}", default_run, binary_extension), + true, + )); } } match binaries.len() { 0 => binaries.push(BundleBinary::new( - if target_os == "linux" { - self.package_settings.product_name.to_kebab_case() - } else { - format!( - "{}{}", - self.package_settings.product_name.clone(), - &binary_extension - ) - }, + format!("{}{}", self.cargo_package_settings.name, &binary_extension), true, )), 1 => binaries.get_mut(0).unwrap().set_main(true), @@ -1002,12 +954,10 @@ impl RustAppSettings { .and_then(|v| v.package); let package_settings = PackageSettings { - product_name: config.product_name.clone().unwrap_or_else(|| { - cargo_package_settings - .name - .clone() - .expect("Cargo manifest must have the `package.name` field") - }), + product_name: config + .product_name + .clone() + .unwrap_or_else(|| cargo_package_settings.name.clone()), version: config.version.clone().unwrap_or_else(|| { cargo_package_settings .version diff --git a/tooling/cli/src/interface/rust/desktop.rs b/tooling/cli/src/interface/rust/desktop.rs index 48c9f48ef753..7927eac25c60 100644 --- a/tooling/cli/src/interface/rust/desktop.rs +++ b/tooling/cli/src/interface/rust/desktop.rs @@ -6,15 +6,11 @@ use super::{ get_profile_dir, AppSettings, DevProcess, ExitReason, Options, RustAppSettings, RustupTarget, }; use crate::CommandExt; -use tauri_utils::display_path; use anyhow::Context; -use heck::ToKebabCase; use shared_child::SharedChild; use std::{ - fs::rename, io::{BufReader, ErrorKind, Write}, - path::{Path, PathBuf}, process::{Command, ExitStatus, Stdio}, sync::{ atomic::{AtomicBool, Ordering}, @@ -70,16 +66,9 @@ pub fn run_dev, ExitReason) + Send + Sync + 'static>( available_targets: &mut Option>, config_features: Vec, app_settings: &RustAppSettings, - product_name: Option, on_exit: F, ) -> crate::Result { let bin_path = app_settings.app_binary_path(&options)?; - let target_os = options - .target - .as_ref() - .and_then(|t| t.split('-').nth(2)) - .unwrap_or(std::env::consts::OS) - .replace("darwin", "macos"); let manually_killed_app = Arc::new(AtomicBool::default()); let manually_killed_app_ = manually_killed_app.clone(); @@ -92,8 +81,6 @@ pub fn run_dev, ExitReason) + Send + Sync + 'static>( config_features, move |status, reason| { if status == Some(0) { - let bin_path = - rename_app(target_os, &bin_path, product_name.as_deref()).expect("failed to rename app"); let mut app = Command::new(bin_path); app.stdout(os_pipe::dup_stdout().unwrap()); app.stderr(os_pipe::dup_stderr().unwrap()); @@ -132,7 +119,6 @@ pub fn run_dev, ExitReason) + Send + Sync + 'static>( pub fn build( options: Options, app_settings: &RustAppSettings, - product_name: Option, available_targets: &mut Option>, config_features: Vec, ) -> crate::Result<()> { @@ -145,13 +131,6 @@ pub fn build( std::env::set_var("STATIC_VCRUNTIME", "true"); } - let target_os = options - .target - .as_ref() - .and_then(|t| t.split('-').nth(2)) - .unwrap_or(std::env::consts::OS) - .replace("darwin", "macos"); - if options.target == Some("universal-apple-darwin".into()) { std::fs::create_dir_all(out_dir).with_context(|| "failed to create project out directory")?; @@ -185,8 +164,6 @@ pub fn build( .with_context(|| "failed to build app")?; } - rename_app(target_os, &bin_path, product_name.as_deref())?; - Ok(()) } @@ -388,37 +365,6 @@ fn validate_target( Ok(()) } -fn rename_app( - target_os: String, - bin_path: &Path, - product_name: Option<&str>, -) -> crate::Result { - if let Some(product_name) = product_name { - let product_name = if target_os == "linux" { - product_name.to_kebab_case() - } else { - product_name.into() - }; - - let product_path = bin_path - .parent() - .unwrap() - .join(product_name) - .with_extension(bin_path.extension().unwrap_or_default()); - - rename(bin_path, &product_path).with_context(|| { - format!( - "failed to rename `{}` to `{}`", - display_path(bin_path), - display_path(&product_path), - ) - })?; - Ok(product_path) - } else { - Ok(bin_path.to_path_buf()) - } -} - // taken from https://github.com/rust-lang/cargo/blob/78b10d4e611ab0721fc3aeaf0edd5dd8f4fdc372/src/cargo/core/shell.rs#L514 #[cfg(unix)] mod terminal { From 2d7876024ed67dd5307281f7211c34e635f63e78 Mon Sep 17 00:00:00 2001 From: amrbashir Date: Thu, 4 Apr 2024 02:48:50 +0200 Subject: [PATCH 02/10] fix bundler --- Cargo.lock | 6 +- core/tauri-build/Cargo.toml | 29 ++++---- core/tauri-macros/Cargo.toml | 20 ++--- core/tauri/Cargo.toml | 137 ++++++++++++++++++++--------------- tooling/bundler/Cargo.toml | 46 ++++++------ 5 files changed, 131 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77e6ae609047..17f30f3f7d2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3508,7 +3508,7 @@ dependencies = [ "getrandom 0.2.12", "glob", "gtk", - "heck 0.4.1", + "heck 0.5.0", "http", "http-range", "image", @@ -3557,7 +3557,7 @@ dependencies = [ "cargo_toml", "dirs-next", "glob", - "heck 0.4.1", + "heck 0.5.0", "json-patch", "quote", "schemars", @@ -3612,7 +3612,7 @@ dependencies = [ name = "tauri-macros" version = "2.0.0-beta.11" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.57", diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index 2c3ad55e0b52..c4aecfc198de 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri-build" version = "2.0.0-beta.11" description = "build time code to pair with https://crates.io/crates/tauri" -exclude = [ "CHANGELOG.md", "/target" ] +exclude = ["CHANGELOG.md", "/target"] readme = "README.md" authors = { workspace = true } homepage = { workspace = true } @@ -20,20 +20,23 @@ targets = [ "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-linux-android", - "x86_64-apple-ios" + "x86_64-apple-ios", ] -rustc-args = [ "--cfg", "docsrs" ] -rustdoc-args = [ "--cfg", "docsrs" ] +rustc-args = ["--cfg", "docsrs"] +rustdoc-args = ["--cfg", "docsrs"] [dependencies] anyhow = "1" quote = { version = "1", optional = true } tauri-codegen = { version = "2.0.0-beta.11", path = "../tauri-codegen", optional = true } -tauri-utils = { version = "2.0.0-beta.11", path = "../tauri-utils", features = [ "build", "resources" ] } +tauri-utils = { version = "2.0.0-beta.11", path = "../tauri-utils", features = [ + "build", + "resources", +] } cargo_toml = "0.17" serde = "1" serde_json = "1" -heck = "0.4" +heck = "0.5" json-patch = "1.2" walkdir = "2" tauri-winres = "0.1" @@ -41,12 +44,12 @@ semver = "1" dirs-next = "2" glob = "0.3" toml = "0.8" -schemars = { version = "0.8", features = [ "preserve_order" ] } +schemars = { version = "0.8", features = ["preserve_order"] } [features] -default = [ "config-json" ] -codegen = [ "tauri-codegen", "quote" ] -isolation = [ "tauri-codegen/isolation", "tauri-utils/isolation" ] -config-json = [ ] -config-json5 = [ "tauri-utils/config-json5" ] -config-toml = [ "tauri-utils/config-toml" ] +default = ["config-json"] +codegen = ["tauri-codegen", "quote"] +isolation = ["tauri-codegen/isolation", "tauri-utils/isolation"] +config-json = [] +config-json5 = ["tauri-utils/config-json5"] +config-toml = ["tauri-utils/config-toml"] diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml index eb554aa1619e..4a6411dd4520 100644 --- a/core/tauri-macros/Cargo.toml +++ b/core/tauri-macros/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri-macros" version = "2.0.0-beta.11" description = "Macros for the tauri crate." -exclude = [ "CHANGELOG.md", "/target" ] +exclude = ["CHANGELOG.md", "/target"] readme = "README.md" authors = { workspace = true } homepage = { workspace = true } @@ -16,17 +16,17 @@ rust-version = { workspace = true } proc-macro = true [dependencies] -proc-macro2 = { version = "1", features = [ "span-locations" ] } +proc-macro2 = { version = "1", features = ["span-locations"] } quote = "1" -syn = { version = "2", features = [ "full" ] } -heck = "0.4" +syn = { version = "2", features = ["full"] } +heck = "0.5" tauri-codegen = { version = "2.0.0-beta.11", default-features = false, path = "../tauri-codegen" } tauri-utils = { version = "2.0.0-beta.11", path = "../tauri-utils" } [features] -custom-protocol = [ ] -compression = [ "tauri-codegen/compression" ] -isolation = [ "tauri-codegen/isolation" ] -config-json5 = [ "tauri-codegen/config-json5", "tauri-utils/config-json5" ] -config-toml = [ "tauri-codegen/config-toml", "tauri-utils/config-toml" ] -tracing = [ ] +custom-protocol = [] +compression = ["tauri-codegen/compression"] +isolation = ["tauri-codegen/isolation"] +config-json5 = ["tauri-codegen/config-json5", "tauri-utils/config-json5"] +config-toml = ["tauri-codegen/config-toml", "tauri-utils/config-toml"] +tracing = [] diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 52cb69bbc919..a8685eeb3439 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri" version = "2.0.0-beta.14" description = "Make tiny, secure apps for all desktop platforms with Tauri" -exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] +exclude = ["/test", "/.scripts", "CHANGELOG.md", "/target"] readme = "README.md" links = "Tauri" authors = { workspace = true } @@ -23,36 +23,44 @@ features = [ "devtools", "image-png", "protocol-asset", - "test" + "test", ] -rustc-args = [ "--cfg", "docsrs" ] -rustdoc-args = [ "--cfg", "docsrs" ] +rustc-args = ["--cfg", "docsrs"] +rustdoc-args = ["--cfg", "docsrs"] default-target = "x86_64-unknown-linux-gnu" targets = [ "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-linux-android", - "x86_64-apple-ios" + "x86_64-apple-ios", ] [package.metadata.cargo-udeps.ignore] -normal = [ "reqwest" ] -build = [ "tauri-build" ] -development = [ "quickcheck_macros" ] +normal = ["reqwest"] +build = ["tauri-build"] +development = ["quickcheck_macros"] [dependencies] -serde_json = { version = "1.0", features = [ "raw_value" ] } -serde = { version = "1.0", features = [ "derive", "rc" ] } -tokio = { version = "1", features = [ "rt", "rt-multi-thread", "sync", "fs", "io-util" ] } +serde_json = { version = "1.0", features = ["raw_value"] } +serde = { version = "1.0", features = ["derive", "rc"] } +tokio = { version = "1", features = [ + "rt", + "rt-multi-thread", + "sync", + "fs", + "io-util", +] } futures-util = "0.3" -uuid = { version = "1", features = [ "v4" ], optional = true } +uuid = { version = "1", features = ["v4"], optional = true } url = "2" anyhow = "1.0" thiserror = "1.0" tauri-runtime = { version = "2.0.0-beta.11", path = "../tauri-runtime" } tauri-macros = { version = "2.0.0-beta.11", path = "../tauri-macros" } -tauri-utils = { version = "2.0.0-beta.11", features = [ "resources" ], path = "../tauri-utils" } +tauri-utils = { version = "2.0.0-beta.11", features = [ + "resources", +], path = "../tauri-utils" } tauri-runtime-wry = { version = "2.0.0-beta.11", path = "../tauri-runtime-wry", optional = true } getrandom = "0.2" serde_repr = "0.1" @@ -60,8 +68,11 @@ state = "0.6" http = "1.1" dirs-next = "2.0" percent-encoding = "2.3" -reqwest = { version = "0.12", default-features = false, features = [ "json", "stream" ] } -bytes = { version = "1", features = [ "serde" ] } +reqwest = { version = "0.12", default-features = false, features = [ + "json", + "stream", +] } +bytes = { version = "1", features = ["serde"] } raw-window-handle = "0.6" glob = "0.3" urlpattern = "0.2" @@ -71,16 +82,18 @@ serialize-to-javascript = "=0.1.1" image = { version = "0.24", default-features = false, optional = true } http-range = { version = "0.1.5", optional = true } tracing = { version = "0.1", optional = true } -heck = "0.4" +heck = "0.5" log = "0.4" [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))".dependencies] -muda = { version = "0.13", default-features = false, features = [ "serde" ] } -tray-icon = { version = "0.13", default-features = false, features = [ "serde" ], optional = true } +muda = { version = "0.13", default-features = false, features = ["serde"] } +tray-icon = { version = "0.13", default-features = false, features = [ + "serde", +], optional = true } [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -gtk = { version = "0.18", features = [ "v3_24" ] } -webkit2gtk = { version = "=2.0.1", features = [ "v2_38" ] } +gtk = { version = "0.18", features = ["v3_24"] } +webkit2gtk = { version = "=2.0.1", features = ["v2_38"] } [target."cfg(target_os = \"macos\")".dependencies] embed_plist = "1.2" @@ -92,9 +105,9 @@ window-vibrancy = "0.5" webview2-com = "0.29" window-vibrancy = "0.5" - [target."cfg(windows)".dependencies.windows] - version = "0.54" - features = [ "Win32_Foundation" ] +[target."cfg(windows)".dependencies.windows] +version = "0.54" +features = ["Win32_Foundation"] [target."cfg(target_os = \"android\")".dependencies] jni = "0.21" @@ -106,55 +119,61 @@ cocoa = "0.25" swift-rs = "1.0.6" [build-dependencies] -heck = "0.4" +heck = "0.5" tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.11" } -tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.11", features = [ "build" ] } +tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.11", features = [ + "build", +] } [dev-dependencies] proptest = "1.4.0" quickcheck = "1.0.3" quickcheck_macros = "1.0.0" -serde = { version = "1.0", features = [ "derive" ] } +serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -tauri = { path = ".", default-features = false, features = [ "wry" ] } -tokio = { version = "1", features = [ "full" ] } +tauri = { path = ".", default-features = false, features = ["wry"] } +tokio = { version = "1", features = ["full"] } cargo_toml = "0.17" http-range = "0.1.5" [features] -default = [ "wry", "compression", "objc-exception", "common-controls-v6" ] -unstable = [ "tauri-runtime-wry/unstable" ] -common-controls-v6 = [ "tray-icon?/common-controls-v6", "muda/common-controls-v6" ] -tray-icon = [ "dep:tray-icon" ] -tracing = [ - "dep:tracing", - "tauri-macros/tracing", - "tauri-runtime-wry/tracing" +default = ["wry", "compression", "objc-exception", "common-controls-v6"] +unstable = ["tauri-runtime-wry/unstable"] +common-controls-v6 = [ + "tray-icon?/common-controls-v6", + "muda/common-controls-v6", +] +tray-icon = ["dep:tray-icon"] +tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry/tracing"] +test = [] +compression = ["tauri-macros/compression", "tauri-utils/compression"] +wry = ["tauri-runtime-wry"] +objc-exception = ["tauri-runtime-wry/objc-exception"] +linux-ipc-protocol = [ + "tauri-runtime-wry/linux-protocol-body", + "webkit2gtk/v2_40", +] +linux-libxdo = ["tray-icon/libxdo", "muda/libxdo"] +isolation = ["tauri-utils/isolation", "tauri-macros/isolation", "uuid"] +custom-protocol = ["tauri-macros/custom-protocol"] +native-tls = ["reqwest/native-tls"] +native-tls-vendored = ["reqwest/native-tls-vendored"] +rustls-tls = ["reqwest/rustls-tls"] +devtools = ["tauri-runtime/devtools", "tauri-runtime-wry/devtools"] +process-relaunch-dangerous-allow-symlink-macos = [ + "tauri-utils/process-relaunch-dangerous-allow-symlink-macos", ] -test = [ ] -compression = [ "tauri-macros/compression", "tauri-utils/compression" ] -wry = [ "tauri-runtime-wry" ] -objc-exception = [ "tauri-runtime-wry/objc-exception" ] -linux-ipc-protocol = [ "tauri-runtime-wry/linux-protocol-body", "webkit2gtk/v2_40" ] -linux-libxdo = [ "tray-icon/libxdo", "muda/libxdo" ] -isolation = [ "tauri-utils/isolation", "tauri-macros/isolation", "uuid" ] -custom-protocol = [ "tauri-macros/custom-protocol" ] -native-tls = [ "reqwest/native-tls" ] -native-tls-vendored = [ "reqwest/native-tls-vendored" ] -rustls-tls = [ "reqwest/rustls-tls" ] -devtools = [ "tauri-runtime/devtools", "tauri-runtime-wry/devtools" ] -process-relaunch-dangerous-allow-symlink-macos = [ "tauri-utils/process-relaunch-dangerous-allow-symlink-macos" ] macos-private-api = [ "tauri-runtime/macos-private-api", - "tauri-runtime-wry/macos-private-api" + "tauri-runtime-wry/macos-private-api", ] -webview-data-url = [ "data-url" ] -protocol-asset = [ "http-range" ] -config-json5 = [ "tauri-macros/config-json5" ] -config-toml = [ "tauri-macros/config-toml" ] -image-ico = [ "image/ico" ] -image-png = [ "image/png" ] -macos-proxy = [ "tauri-runtime-wry/macos-proxy" ] +webview-data-url = ["data-url"] +protocol-asset = ["http-range"] +config-json5 = ["tauri-macros/config-json5"] +config-toml = ["tauri-macros/config-toml"] +image-ico = ["image/ico"] +image-png = ["image/png"] +macos-proxy = ["tauri-runtime-wry/macos-proxy"] [[example]] name = "commands" @@ -167,7 +186,7 @@ path = "../../examples/helloworld/main.rs" [[example]] name = "multiwebview" path = "../../examples/multiwebview/main.rs" -required-features = [ "unstable" ] +required-features = ["unstable"] [[example]] name = "multiwindow" @@ -196,7 +215,7 @@ path = "../../examples/streaming/main.rs" [[example]] name = "isolation" path = "../../examples/isolation/main.rs" -required-features = [ "isolation" ] +required-features = ["isolation"] [[example]] name = "run-iteration" diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index ae434ce5d8af..39dde3150c3d 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -1,68 +1,70 @@ -workspace = { } +workspace = {} [package] name = "tauri-bundler" version = "2.0.1-beta.8" authors = [ "George Burton ", - "Tauri Programme within The Commons Conservancy" + "Tauri Programme within The Commons Conservancy", ] -categories = [ "command-line-utilities", "development-tools::cargo-plugins" ] +categories = ["command-line-utilities", "development-tools::cargo-plugins"] license = "Apache-2.0 OR MIT" -keywords = [ "bundle", "cargo", "tauri" ] +keywords = ["bundle", "cargo", "tauri"] repository = "https://github.com/tauri-apps/tauri" description = "Wrap rust executables in OS-specific app bundles for Tauri" edition = "2021" rust-version = "1.70" -exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ] +exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"] [dependencies] -tauri-utils = { version = "2.0.0-beta.11", path = "../../core/tauri-utils", features = [ "resources" ] } +tauri-utils = { version = "2.0.0-beta.11", path = "../../core/tauri-utils", features = [ + "resources", +] } image = "0.24.9" flate2 = "1.0" anyhow = "1.0" thiserror = "1.0" serde_json = "1.0" -serde = { version = "1.0", features = [ "derive" ] } +serde = { version = "1.0", features = ["derive"] } strsim = "0.11.0" tar = "0.4.40" walkdir = "2" handlebars = "5.1" tempfile = "3.10.1" -log = { version = "0.4.21", features = [ "kv" ] } +log = { version = "0.4.21", features = ["kv"] } dirs-next = "2.0" os_pipe = "1" -ureq = { version = "2.9.6", default-features = false, features = [ "socks-proxy" ] } +ureq = { version = "2.9.6", default-features = false, features = [ + "socks-proxy", +] } native-tls = { version = "0.2", optional = true } hex = "0.4" semver = "1" sha1 = "0.10" sha2 = "0.10" -zip = { version = "0.6", default-features = false, features = [ "deflate" ] } +zip = { version = "0.6", default-features = false, features = ["deflate"] } dunce = "1" [target."cfg(target_os = \"windows\")".dependencies] -uuid = { version = "1", features = [ "v4", "v5" ] } +uuid = { version = "1", features = ["v4", "v5"] } bitness = "0.4" winreg = "0.52" glob = "0.3" - [target."cfg(target_os = \"windows\")".dependencies.windows-sys] - version = "0.52" - features = [ - "Win32_System_SystemInformation", - "Win32_System_Diagnostics_Debug" -] +[target."cfg(target_os = \"windows\")".dependencies.windows-sys] +version = "0.52" +features = ["Win32_System_SystemInformation", "Win32_System_Diagnostics_Debug"] [target."cfg(target_os = \"macos\")".dependencies] icns = { package = "tauri-icns", version = "0.1" } -time = { version = "0.3", features = [ "formatting" ] } +time = { version = "0.3", features = ["formatting"] } plist = "1" [target."cfg(any(target_os = \"macos\", target_os = \"windows\"))".dependencies] regex = "1" [target."cfg(target_os = \"linux\")".dependencies] +heck = "0.5" ar = "0.9.0" md5 = "0.7.0" rpm = "0.14.0" @@ -72,7 +74,7 @@ name = "tauri_bundler" path = "src/lib.rs" [features] -default = [ "rustls" ] -native-tls = [ "ureq/native-tls" ] -native-tls-vendored = [ "native-tls", "native-tls/vendored" ] -rustls = [ "ureq/tls" ] +default = ["rustls"] +native-tls = ["ureq/native-tls"] +native-tls-vendored = ["native-tls", "native-tls/vendored"] +rustls = ["ureq/tls"] From 16944cb175bb13e55ac346c9308c90a40c44365a Mon Sep 17 00:00:00 2001 From: amrbashir Date: Thu, 4 Apr 2024 03:06:07 +0200 Subject: [PATCH 03/10] fix test --- core/tauri-utils/src/platform.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tauri-utils/src/platform.rs b/core/tauri-utils/src/platform.rs index 8b16b99b417f..29bfcc2226ff 100644 --- a/core/tauri-utils/src/platform.rs +++ b/core/tauri-utils/src/platform.rs @@ -357,7 +357,7 @@ mod tests { version: "1.0.0".parse().unwrap(), authors: "", description: "", - crate_name: "", + crate_name: "my-app", }; let env = Env::default(); From 0752857e93f6c33b29c2714b9b5d6c5ac0bbde25 Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Mon, 29 Apr 2024 20:01:38 +0300 Subject: [PATCH 04/10] Discard changes to core/tauri-build/Cargo.toml --- core/tauri-build/Cargo.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index c12342ff50ff..36979373a639 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri-build" version = "2.0.0-beta.13" description = "build time code to pair with https://crates.io/crates/tauri" -exclude = ["CHANGELOG.md", "/target"] +exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" authors = { workspace = true } homepage = { workspace = true } @@ -20,10 +20,10 @@ targets = [ "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-linux-android", - "x86_64-apple-ios", + "x86_64-apple-ios" ] -rustc-args = ["--cfg", "docsrs"] -rustdoc-args = ["--cfg", "docsrs"] +rustc-args = [ "--cfg", "docsrs" ] +rustdoc-args = [ "--cfg", "docsrs" ] [dependencies] anyhow = "1" @@ -41,12 +41,12 @@ semver = "1" dirs-next = "2" glob = "0.3" toml = "0.8" -schemars = { version = "0.8", features = ["preserve_order"] } +schemars = { version = "0.8", features = [ "preserve_order" ] } [features] -default = ["config-json"] -codegen = ["tauri-codegen", "quote"] -isolation = ["tauri-codegen/isolation", "tauri-utils/isolation"] -config-json = [] -config-json5 = ["tauri-utils/config-json5"] -config-toml = ["tauri-utils/config-toml"] +default = [ "config-json" ] +codegen = [ "tauri-codegen", "quote" ] +isolation = [ "tauri-codegen/isolation", "tauri-utils/isolation" ] +config-json = [ ] +config-json5 = [ "tauri-utils/config-json5" ] +config-toml = [ "tauri-utils/config-toml" ] From df02babf79bdcbd24a9f2fb59291523308c4fd5e Mon Sep 17 00:00:00 2001 From: amrbashir Date: Mon, 29 Apr 2024 20:04:58 +0300 Subject: [PATCH 05/10] revert Cargo.toml changes --- core/tauri-macros/Cargo.toml | 16 +++--- core/tauri/Cargo.toml | 103 +++++++++++++++-------------------- tooling/bundler/Cargo.toml | 41 +++++++------- 3 files changed, 73 insertions(+), 87 deletions(-) diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml index 17d797cf5d1d..8087dc4971b8 100644 --- a/core/tauri-macros/Cargo.toml +++ b/core/tauri-macros/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri-macros" version = "2.0.0-beta.13" description = "Macros for the tauri crate." -exclude = ["CHANGELOG.md", "/target"] +exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" authors = { workspace = true } homepage = { workspace = true } @@ -16,7 +16,7 @@ rust-version = { workspace = true } proc-macro = true [dependencies] -proc-macro2 = { version = "1", features = ["span-locations"] } +proc-macro2 = { version = "1", features = [ "span-locations" ] } quote = "1" syn = { version = "2", features = [ "full" ] } heck = "0.5" @@ -24,9 +24,9 @@ tauri-codegen = { version = "2.0.0-beta.13", default-features = false, path = ". tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils" } [features] -custom-protocol = [] -compression = ["tauri-codegen/compression"] -isolation = ["tauri-codegen/isolation"] -config-json5 = ["tauri-codegen/config-json5", "tauri-utils/config-json5"] -config-toml = ["tauri-codegen/config-toml", "tauri-utils/config-toml"] -tracing = [] +custom-protocol = [ ] +compression = [ "tauri-codegen/compression" ] +isolation = [ "tauri-codegen/isolation" ] +config-json5 = [ "tauri-codegen/config-json5", "tauri-utils/config-json5" ] +config-toml = [ "tauri-codegen/config-toml", "tauri-utils/config-toml" ] +tracing = [ ] diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 330e4ced0634..debb529df5f0 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -2,7 +2,7 @@ name = "tauri" version = "2.0.0-beta.16" description = "Make tiny, secure apps for all desktop platforms with Tauri" -exclude = ["/test", "/.scripts", "CHANGELOG.md", "/target"] +exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] readme = "README.md" links = "Tauri" authors = { workspace = true } @@ -26,34 +26,28 @@ features = [ "test", "specta" ] -rustc-args = ["--cfg", "docsrs"] -rustdoc-args = ["--cfg", "docsrs"] +rustc-args = [ "--cfg", "docsrs" ] +rustdoc-args = [ "--cfg", "docsrs" ] default-target = "x86_64-unknown-linux-gnu" targets = [ "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-linux-android", - "x86_64-apple-ios", + "x86_64-apple-ios" ] [package.metadata.cargo-udeps.ignore] -normal = ["reqwest"] -build = ["tauri-build"] -development = ["quickcheck_macros"] +normal = [ "reqwest" ] +build = [ "tauri-build" ] +development = [ "quickcheck_macros" ] [dependencies] -serde_json = { version = "1.0", features = ["raw_value"] } -serde = { version = "1.0", features = ["derive", "rc"] } -tokio = { version = "1", features = [ - "rt", - "rt-multi-thread", - "sync", - "fs", - "io-util", -] } +serde_json = { version = "1.0", features = [ "raw_value" ] } +serde = { version = "1.0", features = [ "derive", "rc" ] } +tokio = { version = "1", features = [ "rt", "rt-multi-thread", "sync", "fs", "io-util" ] } futures-util = "0.3" -uuid = { version = "1", features = ["v4"], optional = true } +uuid = { version = "1", features = [ "v4" ], optional = true } url = "2" anyhow = "1.0" thiserror = "1.0" @@ -67,11 +61,8 @@ state = "0.6" http = "1.1" dirs-next = "2.0" percent-encoding = "2.3" -reqwest = { version = "0.12", default-features = false, features = [ - "json", - "stream", -] } -bytes = { version = "1", features = ["serde"] } +reqwest = { version = "0.12", default-features = false, features = [ "json", "stream" ] } +bytes = { version = "1", features = [ "serde" ] } raw-window-handle = "0.6" glob = "0.3" urlpattern = "0.2" @@ -87,14 +78,12 @@ dunce = "1" specta = { version = "^2.0.0-rc.9", optional = true, default-features = false, features = ["function"] } [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))".dependencies] -muda = { version = "0.13", default-features = false, features = ["serde"] } -tray-icon = { version = "0.13", default-features = false, features = [ - "serde", -], optional = true } +muda = { version = "0.13", default-features = false, features = [ "serde" ] } +tray-icon = { version = "0.13", default-features = false, features = [ "serde" ], optional = true } [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] -gtk = { version = "0.18", features = ["v3_24"] } -webkit2gtk = { version = "=2.0.1", features = ["v2_38"] } +gtk = { version = "0.18", features = [ "v3_24" ] } +webkit2gtk = { version = "=2.0.1", features = [ "v2_38" ] } [target."cfg(target_os = \"macos\")".dependencies] embed_plist = "1.2" @@ -128,43 +117,39 @@ tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.13", features = proptest = "1.4.0" quickcheck = "1.0.3" quickcheck_macros = "1.0.0" -serde = { version = "1.0", features = ["derive"] } +serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" -tauri = { path = ".", default-features = false, features = ["wry"] } -tokio = { version = "1", features = ["full"] } +tauri = { path = ".", default-features = false, features = [ "wry" ] } +tokio = { version = "1", features = [ "full" ] } cargo_toml = "0.17" http-range = "0.1.5" [features] -default = ["wry", "compression", "objc-exception", "common-controls-v6"] -unstable = ["tauri-runtime-wry/unstable"] -common-controls-v6 = [ - "tray-icon?/common-controls-v6", - "muda/common-controls-v6", -] -tray-icon = ["dep:tray-icon"] -tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry/tracing"] -test = [] -compression = ["tauri-macros/compression", "tauri-utils/compression"] -wry = ["tauri-runtime-wry"] -objc-exception = ["tauri-runtime-wry/objc-exception"] -linux-ipc-protocol = [ - "tauri-runtime-wry/linux-protocol-body", - "webkit2gtk/v2_40", -] -linux-libxdo = ["tray-icon/libxdo", "muda/libxdo"] -isolation = ["tauri-utils/isolation", "tauri-macros/isolation", "uuid"] -custom-protocol = ["tauri-macros/custom-protocol"] -native-tls = ["reqwest/native-tls"] -native-tls-vendored = ["reqwest/native-tls-vendored"] -rustls-tls = ["reqwest/rustls-tls"] -devtools = ["tauri-runtime/devtools", "tauri-runtime-wry/devtools"] -process-relaunch-dangerous-allow-symlink-macos = [ - "tauri-utils/process-relaunch-dangerous-allow-symlink-macos", +default = [ "wry", "compression", "objc-exception", "common-controls-v6" ] +unstable = [ "tauri-runtime-wry/unstable" ] +common-controls-v6 = [ "tray-icon?/common-controls-v6", "muda/common-controls-v6" ] +tray-icon = [ "dep:tray-icon" ] +tracing = [ + "dep:tracing", + "tauri-macros/tracing", + "tauri-runtime-wry/tracing" ] +test = [ ] +compression = [ "tauri-macros/compression", "tauri-utils/compression" ] +wry = [ "tauri-runtime-wry" ] +objc-exception = [ "tauri-runtime-wry/objc-exception" ] +linux-ipc-protocol = [ "tauri-runtime-wry/linux-protocol-body", "webkit2gtk/v2_40" ] +linux-libxdo = [ "tray-icon/libxdo", "muda/libxdo" ] +isolation = [ "tauri-utils/isolation", "tauri-macros/isolation", "uuid" ] +custom-protocol = [ "tauri-macros/custom-protocol" ] +native-tls = [ "reqwest/native-tls" ] +native-tls-vendored = [ "reqwest/native-tls-vendored" ] +rustls-tls = [ "reqwest/rustls-tls" ] +devtools = [ "tauri-runtime/devtools", "tauri-runtime-wry/devtools" ] +process-relaunch-dangerous-allow-symlink-macos = [ "tauri-utils/process-relaunch-dangerous-allow-symlink-macos" ] macos-private-api = [ "tauri-runtime/macos-private-api", - "tauri-runtime-wry/macos-private-api", + "tauri-runtime-wry/macos-private-api" ] webview-data-url = [ "data-url" ] protocol-asset = [ "http-range" ] @@ -186,7 +171,7 @@ path = "../../examples/helloworld/main.rs" [[example]] name = "multiwebview" path = "../../examples/multiwebview/main.rs" -required-features = ["unstable"] +required-features = [ "unstable" ] [[example]] name = "multiwindow" @@ -215,7 +200,7 @@ path = "../../examples/streaming/main.rs" [[example]] name = "isolation" path = "../../examples/isolation/main.rs" -required-features = ["isolation"] +required-features = [ "isolation" ] [[example]] name = "run-iteration" diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index 5e353dcb7616..dccbf800b449 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -1,20 +1,20 @@ -workspace = {} +workspace = { } [package] name = "tauri-bundler" version = "2.0.1-beta.10" authors = [ "George Burton ", - "Tauri Programme within The Commons Conservancy", + "Tauri Programme within The Commons Conservancy" ] -categories = ["command-line-utilities", "development-tools::cargo-plugins"] +categories = [ "command-line-utilities", "development-tools::cargo-plugins" ] license = "Apache-2.0 OR MIT" -keywords = ["bundle", "cargo", "tauri"] +keywords = [ "bundle", "cargo", "tauri" ] repository = "https://github.com/tauri-apps/tauri" description = "Wrap rust executables in OS-specific app bundles for Tauri" edition = "2021" rust-version = "1.70" -exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"] +exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ] [dependencies] tauri-utils = { version = "2.0.0-beta.13", path = "../../core/tauri-utils", features = [ "resources" ] } @@ -23,39 +23,40 @@ flate2 = "1.0" anyhow = "1.0" thiserror = "1.0" serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } +serde = { version = "1.0", features = [ "derive" ] } strsim = "0.11.0" tar = "0.4.40" walkdir = "2" handlebars = "5.1" tempfile = "3.10.1" -log = { version = "0.4.21", features = ["kv"] } +log = { version = "0.4.21", features = [ "kv" ] } dirs-next = "2.0" os_pipe = "1" -ureq = { version = "2.9.6", default-features = false, features = [ - "socks-proxy", -] } +ureq = { version = "2.9.6", default-features = false, features = [ "socks-proxy" ] } native-tls = { version = "0.2", optional = true } hex = "0.4" semver = "1" sha1 = "0.10" sha2 = "0.10" -zip = { version = "0.6", default-features = false, features = ["deflate"] } +zip = { version = "0.6", default-features = false, features = [ "deflate" ] } dunce = "1" [target."cfg(target_os = \"windows\")".dependencies] -uuid = { version = "1", features = ["v4", "v5"] } +uuid = { version = "1", features = [ "v4", "v5" ] } bitness = "0.4" winreg = "0.52" glob = "0.3" -[target."cfg(target_os = \"windows\")".dependencies.windows-sys] -version = "0.52" -features = ["Win32_System_SystemInformation", "Win32_System_Diagnostics_Debug"] + [target."cfg(target_os = \"windows\")".dependencies.windows-sys] + version = "0.52" + features = [ + "Win32_System_SystemInformation", + "Win32_System_Diagnostics_Debug" +] [target."cfg(target_os = \"macos\")".dependencies] icns = { package = "tauri-icns", version = "0.1" } -time = { version = "0.3", features = ["formatting"] } +time = { version = "0.3", features = [ "formatting" ] } plist = "1" [target."cfg(any(target_os = \"macos\", target_os = \"windows\"))".dependencies] @@ -72,7 +73,7 @@ name = "tauri_bundler" path = "src/lib.rs" [features] -default = ["rustls"] -native-tls = ["ureq/native-tls"] -native-tls-vendored = ["native-tls", "native-tls/vendored"] -rustls = ["ureq/tls"] +default = [ "rustls" ] +native-tls = [ "ureq/native-tls" ] +native-tls-vendored = [ "native-tls", "native-tls/vendored" ] +rustls = [ "ureq/tls" ] From 6313562b0db74c9d118f5a98f43be33c3cfec20d Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Mon, 29 Apr 2024 20:27:23 +0300 Subject: [PATCH 06/10] Discard changes to Cargo.lock --- Cargo.lock | 324 +++++++++++++++++++++++++++-------------------------- 1 file changed, 167 insertions(+), 157 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8b5257019e0..08a611823145 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,9 +108,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "atk" @@ -236,9 +236,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" @@ -297,9 +297,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.8" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" dependencies = [ "serde", ] @@ -330,9 +330,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.95" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cesu8" @@ -353,9 +353,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.8" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -375,9 +375,9 @@ checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -434,9 +434,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" -version = "4.6.7" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ "bytes", "memchr", @@ -478,9 +478,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.23.2" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -568,17 +568,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] name = "ctor" -version = "0.2.8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -611,7 +611,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -622,7 +622,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -720,7 +720,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -770,7 +770,7 @@ dependencies = [ "rustc_version", "toml 0.8.2", "vswhom", - "winreg", + "winreg 0.52.0", ] [[package]] @@ -813,9 +813,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" @@ -838,9 +838,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -879,7 +879,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -953,7 +953,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -1129,9 +1129,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -1220,7 +1220,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -1299,7 +1299,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -1310,9 +1310,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1400,9 +1400,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "hyper" -version = "1.3.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", "futures-channel", @@ -1550,7 +1550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.14.3", "serde", ] @@ -1823,9 +1823,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2146,7 +2146,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -2210,9 +2210,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", "parking_lot_core", @@ -2220,15 +2220,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] @@ -2245,9 +2245,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" dependencies = [ "memchr", "thiserror", @@ -2256,9 +2256,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.9" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" dependencies = [ "pest", "pest_generator", @@ -2266,22 +2266,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.9" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] name = "pest_meta" -version = "2.7.9" +version = "2.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" dependencies = [ "once_cell", "pest", @@ -2392,7 +2392,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -2439,7 +2439,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -2569,9 +2569,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -2635,9 +2635,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2702,7 +2702,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.12", ] [[package]] @@ -2740,17 +2740,17 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "raw-window-handle" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags 2.5.0", + "bitflags 1.3.2", ] [[package]] @@ -2759,7 +2759,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.12", "libredox", "thiserror", ] @@ -2810,11 +2810,11 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "2d66674f2b6fb864665eea7a3c1ac4e3dfacd2fda83cf6f935a612e01b0e3338" dependencies = [ - "base64 0.22.0", + "base64 0.21.7", "bytes", "futures-core", "futures-util", @@ -2851,7 +2851,7 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -2870,7 +2870,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.14", + "getrandom 0.2.12", "libc", "spin", "untrusted", @@ -2894,9 +2894,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ "bitflags 2.5.0", "errno", @@ -2921,25 +2921,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.22.0", - "rustls-pki-types", + "base64 0.21.7", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring", "rustls-pki-types", @@ -2948,9 +2947,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rusty-fork" @@ -2990,9 +2989,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.17" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55c82c700538496bdc329bb4918a81f87cc8888811bd123cf325a0f2f8d309" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "dyn-clone", "indexmap 1.9.3", @@ -3004,14 +3003,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.17" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83263746fe5e32097f06356968a077f96089739c927a61450efa069905eec108" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.60", + "syn 1.0.109", ] [[package]] @@ -3080,40 +3079,40 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.199" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa 1.0.11", "ryu", @@ -3122,13 +3121,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.19" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -3154,11 +3153,11 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ - "base64 0.22.0", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", @@ -3172,14 +3171,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -3236,9 +3235,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -3278,9 +3277,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3288,9 +3287,9 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.4.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d5d17f23326fe0d9b0af282f73f3af666699420fd5f42629efd9c6e7dc166f" +checksum = "071916a85d1db274b4ed57af3a14afb66bd836ae7f82ebb6f1fd3455107830d9" dependencies = [ "bytemuck", "cfg_aliases", @@ -3300,7 +3299,7 @@ dependencies = [ "js-sys", "log", "objc", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.0", "redox_syscall", "wasm-bindgen", "wayland-sys", @@ -3442,9 +3441,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ "proc-macro2", "quote", @@ -3498,7 +3497,7 @@ dependencies = [ "objc", "once_cell", "parking_lot", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.0", "scopeguard", "tao-macros", "unicode-segmentation", @@ -3539,10 +3538,10 @@ dependencies = [ "dunce", "embed_plist", "futures-util", - "getrandom 0.2.14", + "getrandom 0.2.12", "glob", "gtk", - "heck 0.5.0", + "heck 0.4.1", "http", "http-range", "image", @@ -3556,7 +3555,7 @@ dependencies = [ "proptest", "quickcheck", "quickcheck_macros", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.0", "reqwest", "serde", "serde_json", @@ -3623,7 +3622,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "syn 2.0.60", + "syn 2.0.57", "tauri-utils", "thiserror", "time", @@ -3647,10 +3646,10 @@ dependencies = [ name = "tauri-macros" version = "2.0.0-beta.13" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", "tauri-codegen", "tauri-utils", ] @@ -3678,7 +3677,7 @@ dependencies = [ "gtk", "http", "jni", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.0", "serde", "serde_json", "tauri-utils", @@ -3697,7 +3696,7 @@ dependencies = [ "jni", "log", "percent-encoding", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.0", "softbuffer", "tao", "tauri-runtime", @@ -3719,8 +3718,9 @@ dependencies = [ "cargo_metadata", "ctor", "dunce", - "getrandom 0.2.14", + "getrandom 0.2.12", "glob", + "heck 0.5.0", "html5ever", "infer", "json-patch", @@ -3787,22 +3787,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -3817,9 +3817,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa 1.0.11", @@ -3838,9 +3838,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ "num-conv", "time-core", @@ -3888,7 +3888,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -4033,7 +4033,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -4077,9 +4077,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.13.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97ec55956c54569e74209ae9d29a7a79193b252d17a6ac28bcffd4c11a384ad" +checksum = "8713f74e697917aa794800289e15bce534fc91450312ab2d3edf5b8907f7301a" dependencies = [ "cocoa", "core-graphics", @@ -4249,7 +4249,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.12", ] [[package]] @@ -4357,7 +4357,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", "wasm-bindgen-shared", ] @@ -4391,7 +4391,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4511,7 +4511,7 @@ checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -4543,11 +4543,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ - "windows-sys 0.52.0", + "winapi", ] [[package]] @@ -4564,7 +4564,7 @@ checksum = "33082acd404763b315866e14a0d5193f3422c81086657583937a750cdd3ec340" dependencies = [ "cocoa", "objc", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.0", "windows-sys 0.52.0", "windows-version", ] @@ -4617,7 +4617,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -4628,7 +4628,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.57", ] [[package]] @@ -4715,9 +4715,9 @@ dependencies = [ [[package]] name = "windows-version" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" dependencies = [ "windows-targets 0.52.5", ] @@ -4863,6 +4863,16 @@ dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "winreg" version = "0.52.0" @@ -4875,9 +4885,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.39.3" +version = "0.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e180ac2740d6cb4d5cec0abf63eacbea90f1b7e5e3803043b13c1c84c4b7884" +checksum = "1a4e9d37c0bbf497cd42bc2e0ba12e0040ab42e454f2907dc1e9ddb2eaf52d34" dependencies = [ "base64 0.22.0", "block", @@ -4901,7 +4911,7 @@ dependencies = [ "objc_id", "once_cell", "percent-encoding", - "raw-window-handle 0.6.1", + "raw-window-handle 0.6.0", "sha2", "soup3", "tao-macros", From ddfdb1943b63a687a92684e7c64783d3cd8c3643 Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Mon, 29 Apr 2024 20:27:37 +0300 Subject: [PATCH 07/10] Discard changes to tooling/cli/Cargo.lock --- tooling/cli/Cargo.lock | 1018 +++++++++++++++++++++------------------- 1 file changed, 533 insertions(+), 485 deletions(-) diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 239fa99c997b..8e3f59979aae 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -54,12 +54,12 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" dependencies = [ "cfg-if", - "getrandom 0.2.14", + "getrandom 0.2.12", "once_cell", "serde", "version_check", @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "ar" @@ -162,40 +162,51 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] name = "autocfg" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" dependencies = [ "async-trait", "axum-core", "base64 0.21.7", "bytes", "futures-util", - "http 1.1.0", + "http 1.0.0", "http-body 1.0.0", "http-body-util", - "hyper 1.3.1", + "hyper 1.2.0", "hyper-util", - "itoa 1.0.11", + "itoa 1.0.10", "matchit", "memchr", "mime", @@ -207,7 +218,7 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper 1.0.1", + "sync_wrapper", "tokio", "tokio-tungstenite", "tower", @@ -225,13 +236,13 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.1.0", + "http 1.0.0", "http-body 1.0.0", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper", "tower-layer", "tower-service", "tracing", @@ -239,9 +250,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -336,9 +347,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitness" @@ -401,30 +412,31 @@ dependencies = [ [[package]] name = "buffer-redux" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9f8ddd22e0a12391d1e7ada69ec3b0da1914f1cec39c5cf977143c5b2854f5" +checksum = "d2886ea01509598caac116942abd33ab5a88fa32acdf7e4abfa0fc489ca520c9" dependencies = [ "memchr", + "safemem", ] [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "bytecount" -version = "0.6.8" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" @@ -434,9 +446,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2" @@ -471,9 +483,9 @@ dependencies = [ [[package]] name = "cargo-mobile2" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61dadb1a2dffea43fd83eba99d71367794a776e2053d1405379cc7a9ef24639e" +checksum = "e6eb3459f8fb1fd0e12ca229db09cd763befe00827061cc5aaf6bdf173dad37c" dependencies = [ "colored", "core-foundation", @@ -498,7 +510,7 @@ dependencies = [ "serde_json", "textwrap", "thiserror", - "toml 0.8.12", + "toml 0.8.10", "ureq", "which", "windows", @@ -516,13 +528,11 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.95" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" dependencies = [ - "jobserver", "libc", - "once_cell", ] [[package]] @@ -551,17 +561,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", @@ -569,7 +573,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.4", ] [[package]] @@ -584,9 +588,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" dependencies = [ "clap_builder", "clap_derive", @@ -594,35 +598,35 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim 0.11.0", ] [[package]] name = "clap_complete" -version = "4.5.2" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -659,6 +663,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" version = "0.15.8" @@ -832,17 +845,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] name = "ctor" -version = "0.2.8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" +checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -856,9 +869,9 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" dependencies = [ "nix", "windows-sys 0.52.0", @@ -889,7 +902,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -937,7 +950,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -959,14 +972,14 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] name = "data-encoding" -version = "2.6.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "data-url" @@ -976,9 +989,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "der" -version = "0.7.9" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "pem-rfc7468", @@ -1050,9 +1063,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322ef0094744e63628e6f0eb2295517f79276a5b342a4c2ff3042566ca181d4e" +checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" [[package]] name = "dialoguer" @@ -1204,9 +1217,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" @@ -1231,16 +1244,16 @@ dependencies = [ [[package]] name = "embed-resource" -version = "2.4.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881" dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.8.12", + "toml 0.8.10", "vswhom", - "winreg 0.52.0", + "winreg 0.51.0", ] [[package]] @@ -1251,9 +1264,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1283,7 +1296,7 @@ checksum = "ba7795da175654fe16979af73f81f26a8ea27638d8d9823d317016888a63dc4c" dependencies = [ "num-traits", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -1317,9 +1330,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" +checksum = "388979d208a049ffdfb22fa33b9c81942215b940910bccfe258caeb25d125cb3" dependencies = [ "serde", ] @@ -1334,6 +1347,27 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "exr" version = "1.72.0" @@ -1362,9 +1396,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" @@ -1387,9 +1421,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.8" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "filetime" @@ -1399,15 +1433,15 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1564,7 +1598,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -1636,9 +1670,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -1649,9 +1683,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug", "polyval", @@ -1715,17 +1749,36 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.26" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.12", - "indexmap 2.2.6", + "http 0.2.11", + "indexmap 2.2.4", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.2.4", "slab", "tokio", "tokio-util", @@ -1734,9 +1787,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "cfg-if", "crunchy", @@ -1758,9 +1811,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "5.1.2" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" +checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4" dependencies = [ "log", "pest", @@ -1778,15 +1831,18 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "heck" @@ -1849,24 +1905,24 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", - "itoa 1.0.11", + "itoa 1.0.10", ] [[package]] name = "http" -version = "1.1.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" dependencies = [ "bytes", "fnv", - "itoa 1.0.11", + "itoa 1.0.10", ] [[package]] @@ -1876,7 +1932,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.12", + "http 0.2.11", "pin-project-lite", ] @@ -1887,18 +1943,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.1.0", + "http 1.0.0", ] [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ "bytes", - "futures-core", - "http 1.1.0", + "futures-util", + "http 1.0.0", "http-body 1.0.0", "pin-project-lite", ] @@ -1931,12 +1987,12 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http 0.2.12", + "h2 0.3.24", + "http 0.2.11", "http-body 0.4.6", "httparse", "httpdate", - "itoa 1.0.11", + "itoa 1.0.10", "pin-project-lite", "socket2", "tokio", @@ -1947,18 +2003,19 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "h2 0.4.2", + "http 1.0.0", "http-body 1.0.0", "httparse", "httpdate", - "itoa 1.0.11", + "itoa 1.0.10", "pin-project-lite", "smallvec", "tokio", @@ -1972,9 +2029,9 @@ checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.0.0", "http-body 1.0.0", - "hyper 1.3.1", + "hyper 1.2.0", "pin-project-lite", "socket2", "tokio", @@ -2100,12 +2157,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "967d6dd42f16dbf0eb8040cb9e477933562684d3918f7d253f2ff9087fb3e7a3" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.14.3", "serde", ] @@ -2205,9 +2262,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "java-properties" @@ -2220,15 +2277,6 @@ dependencies = [ "regex", ] -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -2240,9 +2288,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -2272,9 +2320,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.22.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" +checksum = "16fcc9dd231e72d22993f1643d5f7f0db785737dbe3c3d7ca222916ab4280795" dependencies = [ "jsonrpsee-core", "jsonrpsee-server", @@ -2284,12 +2332,12 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.22.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" +checksum = "0476c96eb741b40d39dcb39d0124e3b9be9840ec77653c42a0996563ae2a53f7" dependencies = [ "futures-util", - "http 0.2.12", + "http 0.2.11", "jsonrpsee-core", "pin-project", "soketto", @@ -2302,11 +2350,12 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.22.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" +checksum = "b974d8f6139efbe8425f32cb33302aba6d5e049556b5bfc067874e7a0da54a2e" dependencies = [ "anyhow", + "async-lock", "async-trait", "beef", "futures-timer", @@ -2327,12 +2376,12 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.22.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41" +checksum = "344440ccd8492c1ca65f1391c5aa03f91189db38d602d189b9266a1a5c6a4d22" dependencies = [ "futures-util", - "http 0.2.12", + "http 0.2.11", "hyper 0.14.28", "jsonrpsee-core", "jsonrpsee-types", @@ -2351,9 +2400,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.22.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" +checksum = "b13dac43c1a9fc2648b37f306b0a5b0e29b2a6e1c36a33b95c1948da2494e9c5" dependencies = [ "anyhow", "beef", @@ -2364,11 +2413,11 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.22.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b9db2dfd5bb1194b0ce921504df9ceae210a345bc2f6c5a61432089bbab070" +checksum = "b1bbaaf4ce912654081d997ade417c3155727db106c617c0612e85f504c2f744" dependencies = [ - "http 0.2.12", + "http 0.2.11", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -2388,9 +2437,9 @@ dependencies = [ "clap", "fancy-regex", "fraction", - "getrandom 0.2.14", + "getrandom 0.2.12", "iso8601", - "itoa 1.0.11", + "itoa 1.0.10", "memchr", "num-cmp", "once_cell", @@ -2503,12 +2552,12 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-sys 0.48.0", ] [[package]] @@ -2519,19 +2568,23 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.1.3" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "libc", + "redox_syscall", ] [[package]] name = "line-wrap" -version = "0.2.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] [[package]] name = "linux-raw-sys" @@ -2559,9 +2612,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2637,9 +2690,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -2668,7 +2721,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b23ef13ff1d745b1e52397daaa247e333c607f3cff96d4df2b798dc252db974b" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.12", "rpassword", "scrypt", ] @@ -2685,9 +2738,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -2697,11 +2750,11 @@ dependencies = [ [[package]] name = "napi" -version = "2.16.4" +version = "2.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1edd9510299935e4f52a24d1e69ebd224157e3e962c6c847edec5c2e4f786f" +checksum = "54a63d0570e4c3e0daf7a8d380563610e159f538e20448d6c911337246f40e84" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "ctor", "napi-derive", "napi-sys", @@ -2710,29 +2763,29 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.1.3" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a" +checksum = "2f9130fccc5f763cf2069b34a089a18f0d0883c66aceb81f2fad541a3d823c43" [[package]] name = "napi-derive" -version = "2.16.3" +version = "2.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a6de411b6217dbb47cd7a8c48684b162309ff48a77df9228c082400dd5b030" +checksum = "05bb7c37e3c1dda9312fdbe4a9fc7507fca72288ba154ec093e2d49114e727ce" dependencies = [ "cfg-if", "convert_case 0.6.0", "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] name = "napi-derive-backend" -version = "1.0.65" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e35868d43b178b0eb9c17bd018960b1b5dd1732a7d47c23debe8f5c4caf498" +checksum = "f785a8b8d7b83e925f5aa6d2ae3c159d17fe137ac368dc185bef410e7acdaeb4" dependencies = [ "convert_case 0.6.0", "once_cell", @@ -2740,14 +2793,14 @@ dependencies = [ "quote", "regex", "semver", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] name = "napi-sys" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" +checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" dependencies = [ "libloading", ] @@ -2797,19 +2850,18 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.6" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "nix" -version = "0.28.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "cfg-if", - "cfg_aliases", "libc", ] @@ -2835,7 +2887,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -2861,9 +2913,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", @@ -2931,7 +2983,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -3004,7 +3056,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -3034,9 +3086,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" @@ -3044,7 +3096,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -3061,7 +3113,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -3081,9 +3133,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -3103,13 +3155,13 @@ dependencies = [ [[package]] name = "os_info" -version = "3.8.2" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", "serde", - "windows-sys 0.52.0", + "winapi", ] [[package]] @@ -3146,11 +3198,17 @@ dependencies = [ "sha2", ] +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", "parking_lot_core", @@ -3158,15 +3216,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] @@ -3193,11 +3251,11 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.4" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64 0.22.0", + "base64 0.21.7", "serde", ] @@ -3218,9 +3276,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" dependencies = [ "memchr", "thiserror", @@ -3229,9 +3287,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.9" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809" dependencies = [ "pest", "pest_generator", @@ -3239,22 +3297,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.9" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] name = "pest_meta" -version = "2.7.9" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a" dependencies = [ "once_cell", "pest", @@ -3421,7 +3479,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -3459,29 +3517,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3518,18 +3576,18 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.4.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "plist" -version = "1.6.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ "base64 0.21.7", - "indexmap 2.2.6", + "indexmap 2.2.4", "line-wrap", "quick-xml", "serde", @@ -3551,9 +3609,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" dependencies = [ "cfg-if", "cpufeatures", @@ -3605,9 +3663,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -3632,9 +3690,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3699,7 +3757,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.12", ] [[package]] @@ -3722,9 +3780,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.10.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -3749,31 +3807,22 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.5.0", -] - [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.12", "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -3783,9 +3832,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -3794,23 +3843,23 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2", - "http 0.2.12", + "h2 0.3.24", + "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", "ipnet", @@ -3823,7 +3872,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper", "system-configuration", "tokio", "tower-service", @@ -3878,7 +3927,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.14", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted", @@ -3923,7 +3972,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e68a0d60350e5f4229cd69f08ec8f373e34424701702d1ee51a89aee1e9adcd1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "bzip2", "chrono", "cpio", @@ -4014,11 +4063,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys 0.4.13", @@ -4027,9 +4076,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" dependencies = [ "log", "ring", @@ -4041,15 +4090,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring", "rustls-pki-types", @@ -4058,9 +4107,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" @@ -4068,7 +4117,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.4.2", "bytemuck", "smallvec", "ttf-parser", @@ -4084,6 +4133,12 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + [[package]] name = "salsa20" version = "0.10.2" @@ -4113,9 +4168,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.17" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f55c82c700538496bdc329bb4918a81f87cc8888811bd123cf325a0f2f8d309" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "dyn-clone", "schemars_derive", @@ -4126,14 +4181,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.17" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83263746fe5e32097f06356968a077f96089739c927a61450efa069905eec108" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.60", + "syn 1.0.109", ] [[package]] @@ -4169,9 +4224,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -4182,9 +4237,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -4218,9 +4273,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.199" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -4237,24 +4292,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 1.0.109", ] [[package]] @@ -4268,23 +4323,23 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ - "indexmap 2.2.6", - "itoa 1.0.11", + "indexmap 2.2.4", + "itoa 1.0.10", "ryu", "serde", ] [[package]] name = "serde_path_to_error" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" dependencies = [ - "itoa 1.0.11", + "itoa 1.0.10", "serde", ] @@ -4304,22 +4359,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.11", + "itoa 1.0.10", "ryu", "serde", ] [[package]] name = "serde_with" -version = "3.8.1" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" dependencies = [ - "base64 0.22.0", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.2.4", "serde", "serde_derive", "serde_json", @@ -4329,14 +4384,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" dependencies = [ "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -4489,9 +4544,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smawk" @@ -4501,9 +4556,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4529,7 +4584,7 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http 0.2.12", + "http 0.2.11", "httparse", "log", "rand 0.8.5", @@ -4622,9 +4677,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "sublime_fuzzy" @@ -4640,15 +4695,15 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "sval" -version = "2.13.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53eb957fbc79a55306d5d25d87daf3627bc3800681491cda0709eef36c748bfe" +checksum = "82a2386bea23a121e4e72450306b1dd01078b6399af11b93897bf84640a28a59" [[package]] name = "sval_buffer" -version = "2.13.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96e860aef60e9cbf37888d4953a13445abf523c534640d1f6174d310917c410d" +checksum = "b16c047898a0e19002005512243bc9ef1c1037aad7d03d6c594e234efec80795" dependencies = [ "sval", "sval_ref", @@ -4656,40 +4711,40 @@ dependencies = [ [[package]] name = "sval_dynamic" -version = "2.13.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3f2b07929a1127d204ed7cb3905049381708245727680e9139dac317ed556f" +checksum = "a74fb116e2ecdcb280b0108aa2ee4434df50606c3208c47ac95432730eaac20c" dependencies = [ "sval", ] [[package]] name = "sval_fmt" -version = "2.13.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e188677497de274a1367c4bda15bd2296de4070d91729aac8f0a09c1abf64d" +checksum = "10837b4f0feccef271b2b1c03784e08f6d0bb6d23272ec9e8c777bfadbb8f1b8" dependencies = [ - "itoa 1.0.11", + "itoa 1.0.10", "ryu", "sval", ] [[package]] name = "sval_json" -version = "2.13.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f456c07dae652744781f2245d5e3b78e6a9ebad70790ac11eb15dbdbce5282" +checksum = "891f5ecdf34ce61a8ab2d10f9cfdc303347b0afec4dad6702757419d2d8312a9" dependencies = [ - "itoa 1.0.11", + "itoa 1.0.10", "ryu", "sval", ] [[package]] name = "sval_nested" -version = "2.13.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886feb24709f0476baaebbf9ac10671a50163caa7e439d7a7beb7f6d81d0a6fb" +checksum = "63fcffb4b79c531f38e3090788b64f3f4d54a180aacf02d69c42fa4e4bf284c3" dependencies = [ "sval", "sval_buffer", @@ -4698,18 +4753,18 @@ dependencies = [ [[package]] name = "sval_ref" -version = "2.13.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2e7fc517d778f44f8cb64140afa36010999565528d48985f55e64d45f369ce" +checksum = "af725f9c2aa7cec4ca9c47da2cc90920c4c82d3fa537094c66c77a5459f5809d" dependencies = [ "sval", ] [[package]] name = "sval_serde" -version = "2.13.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79bf66549a997ff35cd2114a27ac4b0c2843280f2cfa84b240d169ecaa0add46" +checksum = "3d7589c649a03d21df40b9a926787d2c64937fa1dccec8d87c6cd82989a2e0a4" dependencies = [ "serde", "sval", @@ -4739,9 +4794,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -4754,12 +4809,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" -[[package]] -name = "sync_wrapper" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" - [[package]] name = "sysctl" version = "0.4.6" @@ -4816,7 +4865,7 @@ dependencies = [ "dunce", "flate2", "glob", - "handlebars 5.1.2", + "handlebars 5.1.0", "heck 0.5.0", "hex", "image", @@ -4832,7 +4881,7 @@ dependencies = [ "serde_json", "sha1", "sha2", - "strsim 0.11.1", + "strsim 0.11.0", "tar", "tauri-icns", "tauri-utils 2.0.0-beta.13", @@ -4867,8 +4916,8 @@ dependencies = [ "dunce", "env_logger", "glob", - "handlebars 5.1.2", - "heck 0.5.0", + "handlebars 5.1.0", + "heck 0.4.1", "html5ever", "ignore", "image", @@ -4904,8 +4953,8 @@ dependencies = [ "tauri-utils 2.0.0-beta.13", "thiserror", "tokio", - "toml 0.8.12", - "toml_edit 0.22.12", + "toml 0.8.10", + "toml_edit 0.22.6", "unicode-width", "ureq", "url", @@ -4943,7 +4992,7 @@ dependencies = [ "aes-gcm", "ctor", "dunce", - "getrandom 0.2.14", + "getrandom 0.2.12", "heck 0.4.1", "html5ever", "infer 0.13.0", @@ -4972,8 +5021,9 @@ dependencies = [ "aes-gcm", "ctor", "dunce", - "getrandom 0.2.14", + "getrandom 0.2.12", "glob", + "heck 0.5.0", "html5ever", "infer 0.15.0", "json-patch", @@ -4990,7 +5040,7 @@ dependencies = [ "serde_with", "serialize-to-javascript", "thiserror", - "toml 0.8.12", + "toml 0.8.10", "url", "urlpattern", "walkdir", @@ -5004,7 +5054,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "rustix 0.38.34", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -5049,22 +5099,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -5080,12 +5130,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", - "itoa 1.0.11", + "itoa 1.0.10", "num-conv", "powerfmt", "serde", @@ -5101,9 +5151,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ "num-conv", "time-core", @@ -5152,9 +5202,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -5175,14 +5225,14 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -5231,15 +5281,15 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.2.4", "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit 0.22.6", ] [[package]] @@ -5257,7 +5307,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.2.4", "serde", "serde_spanned", "toml_datetime", @@ -5270,22 +5320,22 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.2.4", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.2.4", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.7", + "winnow 0.6.3", ] [[package]] @@ -5336,7 +5386,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -5378,7 +5428,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.1.0", + "http 1.0.0", "httparse", "log", "rand 0.8.5", @@ -5524,9 +5574,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "universal-hash" @@ -5546,11 +5596,11 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" dependencies = [ - "base64 0.22.0", + "base64 0.21.7", "flate2", "log", "native-tls", @@ -5629,19 +5679,19 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.12", "sha1_smol", ] [[package]] name = "value-bag" -version = "1.8.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74797339c3b98616c009c7c3eb53a0ce41e85c8ec66bd3db96ed132d20cfdee8" +checksum = "126e423afe2dd9ac52142e7e9d5ce4135d7e13776c529d27fd6bc49f19e3280b" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -5649,9 +5699,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.8.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc35703541cbccb5278ef7b589d79439fc808ff0b5867195a3230f9a47421d39" +checksum = "ede32f342edc46e84bd41fd394ce2192b553de11725dd83b6223150610c21b44" dependencies = [ "erased-serde", "serde", @@ -5660,9 +5710,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.8.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285b43c29d0b4c0e65aad24561baee67a1b69dc9be9375d4a85138cbf556f7f8" +checksum = "0024e44b25144c2f4d0ed35d39688e0090d57753e20fef38d08e0c1a40bdf23d" dependencies = [ "sval", "sval_buffer", @@ -5707,9 +5757,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5738,9 +5788,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5748,24 +5798,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -5775,9 +5825,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5785,28 +5835,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -5829,14 +5879,15 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" -version = "6.0.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" dependencies = [ "either", "home", - "rustix 0.38.34", - "winsafe", + "once_cell", + "rustix 0.38.31", + "windows-sys 0.48.0", ] [[package]] @@ -5857,11 +5908,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ - "windows-sys 0.52.0", + "winapi", ] [[package]] @@ -5877,7 +5928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.5", + "windows-targets 0.52.4", ] [[package]] @@ -5886,7 +5937,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.4", ] [[package]] @@ -5896,16 +5947,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.4", ] [[package]] name = "windows-result" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.4", ] [[package]] @@ -5923,7 +5974,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.4", ] [[package]] @@ -5943,27 +5994,26 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] name = "windows-version" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.4", ] [[package]] @@ -5974,9 +6024,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -5986,9 +6036,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -5998,15 +6048,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -6016,9 +6060,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -6028,9 +6072,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -6040,9 +6084,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -6052,9 +6096,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" @@ -6067,9 +6111,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.7" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" +checksum = "44e19b97e00a4d3db3cdb9b53c8c5f87151b5689b82cc86c2848cbdcccb2689b" dependencies = [ "memchr", ] @@ -6086,19 +6130,23 @@ dependencies = [ [[package]] name = "winreg" -version = "0.52.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" dependencies = [ "cfg-if", "windows-sys 0.48.0", ] [[package]] -name = "winsafe" -version = "0.0.19" +name = "winreg" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] [[package]] name = "x25519-dalek" @@ -6139,7 +6187,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.13", - "rustix 0.38.34", + "rustix 0.38.31", ] [[package]] @@ -6174,7 +6222,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -6194,7 +6242,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.52", ] [[package]] @@ -6211,27 +6259,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", "pkg-config", From 46bc34956d5b2f0688ffa4338e2f73aaa499428e Mon Sep 17 00:00:00 2001 From: amrbashir Date: Mon, 29 Apr 2024 20:29:33 +0300 Subject: [PATCH 08/10] lock file --- Cargo.lock | 5 ++--- tooling/cli/Cargo.lock | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 08a611823145..49539821382e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3541,7 +3541,7 @@ dependencies = [ "getrandom 0.2.12", "glob", "gtk", - "heck 0.4.1", + "heck 0.5.0", "http", "http-range", "image", @@ -3646,7 +3646,7 @@ dependencies = [ name = "tauri-macros" version = "2.0.0-beta.13" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.57", @@ -3720,7 +3720,6 @@ dependencies = [ "dunce", "getrandom 0.2.12", "glob", - "heck 0.5.0", "html5ever", "infer", "json-patch", diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 8e3f59979aae..532cdc9dae3c 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -1840,9 +1840,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -4917,7 +4914,7 @@ dependencies = [ "env_logger", "glob", "handlebars 5.1.0", - "heck 0.4.1", + "heck 0.5.0", "html5ever", "ignore", "image", @@ -5023,7 +5020,6 @@ dependencies = [ "dunce", "getrandom 0.2.12", "glob", - "heck 0.5.0", "html5ever", "infer 0.15.0", "json-patch", From c6123dac2fe669b6979f8ce37e260f82c166f54c Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Sat, 25 May 2024 07:43:29 -0300 Subject: [PATCH 09/10] use product name for installers --- tooling/bundler/src/bundle/linux/appimage.rs | 8 ++++---- tooling/bundler/src/bundle/linux/debian.rs | 2 +- tooling/bundler/src/bundle/macos/dmg.rs | 4 ++-- tooling/bundler/src/bundle/windows/msi/wix.rs | 2 +- tooling/bundler/src/bundle/windows/nsis.rs | 2 +- tooling/cli/Cargo.toml | 4 ++++ 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tooling/bundler/src/bundle/linux/appimage.rs b/tooling/bundler/src/bundle/linux/appimage.rs index e28e795c4f47..7c9b26a1f2ac 100644 --- a/tooling/bundler/src/bundle/linux/appimage.rs +++ b/tooling/bundler/src/bundle/linux/appimage.rs @@ -42,22 +42,22 @@ pub fn bundle_project(settings: &Settings) -> crate::Result> { remove_dir_all(&output_path)?; } std::fs::create_dir_all(output_path.clone())?; - let app_dir_path = output_path.join(format!("{}.AppDir", settings.main_binary_name())); + let app_dir_path = output_path.join(format!("{}.AppDir", settings.product_name())); let appimage_filename = format!( "{}_{}_{}.AppImage", - settings.main_binary_name(), + settings.product_name(), settings.version_string(), arch ); let appimage_path = output_path.join(&appimage_filename); path_utils::create(app_dir_path, true)?; - let upcase_app_name = settings.main_binary_name().to_uppercase(); + let upcase_app_name = settings.product_name().to_uppercase(); // setup data to insert into shell script let mut sh_map = BTreeMap::new(); sh_map.insert("arch", settings.target().split('-').next().unwrap()); - sh_map.insert("app_name", settings.main_binary_name()); + sh_map.insert("app_name", settings.product_name()); sh_map.insert("app_name_uppercase", &upcase_app_name); sh_map.insert("appimage_filename", &appimage_filename); let tauri_tools_path = dirs_next::cache_dir().map_or_else( diff --git a/tooling/bundler/src/bundle/linux/debian.rs b/tooling/bundler/src/bundle/linux/debian.rs index f931ace555fe..250ad3b237c4 100644 --- a/tooling/bundler/src/bundle/linux/debian.rs +++ b/tooling/bundler/src/bundle/linux/debian.rs @@ -50,7 +50,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result> { }; let package_base_name = format!( "{}_{}_{}", - settings.main_binary_name(), + settings.product_name(), settings.version_string(), arch ); diff --git a/tooling/bundler/src/bundle/macos/dmg.rs b/tooling/bundler/src/bundle/macos/dmg.rs index 7356e755b5a1..338866fe79a0 100644 --- a/tooling/bundler/src/bundle/macos/dmg.rs +++ b/tooling/bundler/src/bundle/macos/dmg.rs @@ -40,7 +40,7 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result< let output_path = settings.project_out_directory().join("bundle/dmg"); let package_base_name = format!( "{}_{}_{}", - settings.main_binary_name(), + settings.product_name(), settings.version_string(), match settings.binary_arch() { "x86_64" => "x64", @@ -50,7 +50,7 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result< let dmg_name = format!("{}.dmg", &package_base_name); let dmg_path = output_path.join(&dmg_name); - let product_name = settings.main_binary_name(); + let product_name = settings.product_name(); let bundle_file_name = format!("{}.app", product_name); let bundle_dir = settings.project_out_directory().join("bundle/macos"); diff --git a/tooling/bundler/src/bundle/windows/msi/wix.rs b/tooling/bundler/src/bundle/windows/msi/wix.rs index 66e2562fda4f..e0e3d10fb020 100644 --- a/tooling/bundler/src/bundle/windows/msi/wix.rs +++ b/tooling/bundler/src/bundle/windows/msi/wix.rs @@ -192,7 +192,7 @@ fn app_installer_output_path( let package_base_name = format!( "{}_{}_{}_{}", - settings.main_binary_name().replace(".exe", ""), + settings.product_name(), version, arch, language, diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs index 46b48ad2921c..1c6320a0fbb0 100644 --- a/tooling/bundler/src/bundle/windows/nsis.rs +++ b/tooling/bundler/src/bundle/windows/nsis.rs @@ -466,7 +466,7 @@ fn build_nsis_app_installer( let package_base_name = format!( "{}_{}_{}-setup", - main_binary.name().replace(".exe", ""), + settings.product_name(), settings.version_string(), arch, ); diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index 0b17590e4f0a..7833560f7597 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -117,6 +117,10 @@ native-tls = [ native-tls-vendored = [ "native-tls", "tauri-bundler/native-tls-vendored" ] rustls = [ "tauri-bundler/rustls", "cargo-mobile2/rustls", "ureq/tls" ] +# optimize flate2 on debug +[profile.dev.package.miniz_oxide] +opt-level = 3 + [profile.release-size-optimized] inherits = "release" codegen-units = 1 From e1e475e5e3407fd517073f3c972c9d3fad45bcfe Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Sat, 25 May 2024 07:44:50 -0300 Subject: [PATCH 10/10] only warn for sign on windows --- tooling/bundler/src/bundle.rs | 53 ++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/tooling/bundler/src/bundle.rs b/tooling/bundler/src/bundle.rs index b4a937550529..c77e1b8ac1b5 100644 --- a/tooling/bundler/src/bundle.rs +++ b/tooling/bundler/src/bundle.rs @@ -63,35 +63,38 @@ pub fn bundle_project(settings: Settings) -> crate::Result> { log::warn!("Cross-platform compilation is experimental and does not support all features. Please use a matching host system for full compatibility."); } - if settings.can_sign() { - // Sign windows binaries before the bundling step in case neither wix and nsis bundles are enabled - for bin in settings.binaries() { - let bin_path = settings.binary_path(bin); - windows::sign::try_sign(&bin_path, &settings)?; - } - - // Sign the sidecar binaries - for bin in settings.external_binaries() { - let path = bin?; - let skip = std::env::var("TAURI_SKIP_SIDECAR_SIGNATURE_CHECK").map_or(false, |v| v == "true"); - if skip { - continue; + // Sign windows binaries before the bundling step in case neither wix and nsis bundles are enabled + if target_os == "windows" { + if settings.can_sign() { + for bin in settings.binaries() { + let bin_path = settings.binary_path(bin); + windows::sign::try_sign(&bin_path, &settings)?; } - #[cfg(windows)] - if windows::sign::verify(&path)? { - log::info!( - "sidecar at \"{}\" already signed. Skipping...", - path.display() - ); - continue; - } + // Sign the sidecar binaries + for bin in settings.external_binaries() { + let path = bin?; + let skip = + std::env::var("TAURI_SKIP_SIDECAR_SIGNATURE_CHECK").map_or(false, |v| v == "true"); + if skip { + continue; + } - windows::sign::try_sign(&path, &settings)?; + #[cfg(windows)] + if windows::sign::verify(&path)? { + log::info!( + "sidecar at \"{}\" already signed. Skipping...", + path.display() + ); + continue; + } + + windows::sign::try_sign(&path, &settings)?; + } + } else { + #[cfg(not(target_os = "windows"))] + log::warn!("Signing, by default, is only supported on Windows hosts, but you can specify a custom signing command in `bundler > windows > sign_command`, for now, skipping signing the installer..."); } - } else { - #[cfg(not(target_os = "windows"))] - log::warn!("Signing, by default, is only supported on Windows hosts, but you can specify a custom signing command in `bundler > windows > sign_command`, for now, skipping signing the installer..."); } for package_type in &package_types {