Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions crates/tauri-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ fn copy_binaries(

if package_name == Some(&file_name) {
return Err(anyhow::anyhow!(
"Cannot define a sidecar with the same name as the Cargo package name `{}`. Please change the sidecar name in the filesystem and the Tauri configuration.",
file_name
"Cannot define a sidecar with the same name as the Cargo package name `{file_name}`. Please change the sidecar name in the filesystem and the Tauri configuration."
));
}

Expand Down Expand Up @@ -183,8 +182,7 @@ fn copy_frameworks(dest_dir: &Path, frameworks: &[String]) -> Result<()> {
continue;
} else if framework.contains('/') {
return Err(anyhow::anyhow!(
"Framework path should have .framework extension: {}",
framework
"Framework path should have .framework extension: {framework}"
));
}
if let Some(home_dir) = dirs::home_dir() {
Expand Down Expand Up @@ -642,7 +640,7 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
}

if window_icon_path.exists() {
res.set_icon_with_id(&window_icon_path.display().to_string(), "32512");
res.set_icon(&window_icon_path.display().to_string());
} else {
return Err(anyhow!(format!(
"`{}` not found; required for generating a Windows Resource file during tauri-build",
Expand Down
1 change: 0 additions & 1 deletion crates/tauri-bundler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ dunce = "1"
url = "2"
uuid = { version = "1", features = ["v4", "v5"] }
regex = "1"
goblin = "0.9"
plist = "1"


Expand Down
3 changes: 0 additions & 3 deletions crates/tauri-bundler/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ pub enum Error {
/// Failed to validate downloaded file hash.
#[error("hash mismatch of downloaded file")]
HashError,
/// Failed to parse binary
#[error("Binary parse error: `{0}`")]
BinaryParseError(#[from] goblin::error::Error),
Comment on lines -95 to -97

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a breaking change

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh well, guess we'll see it later then

/// Package type is not supported by target platform
#[error("Wrong package type {0} for platform {1}")]
InvalidPackageType(String, String),
Expand Down
16 changes: 8 additions & 8 deletions crates/tauri-cli/src/interface/rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::{
collections::HashMap,
ffi::OsStr,
fs::FileType,
io::{BufRead, Write},
io::BufRead,
iter::once,
path::{Path, PathBuf},
process::Command,
Expand Down Expand Up @@ -382,14 +382,14 @@ fn build_ignore_matcher(dir: &Path) -> IgnoreMatcher {
}

fn lookup<F: FnMut(FileType, PathBuf)>(dir: &Path, mut f: F) {
let mut default_gitignore = std::env::temp_dir();
default_gitignore.push(".tauri");
let _ = std::fs::create_dir_all(&default_gitignore);
default_gitignore.push(".gitignore");
let default_gitignore_folder = std::env::temp_dir().join(".tauri");
let _ = std::fs::create_dir_all(&default_gitignore_folder);
let default_gitignore = default_gitignore_folder.join(".gitignore");
if !default_gitignore.exists() {
if let Ok(mut file) = std::fs::File::create(default_gitignore.clone()) {
let _ = file.write_all(crate::dev::TAURI_CLI_BUILTIN_WATCHER_IGNORE_FILE);
}
let _ = std::fs::write(
&default_gitignore,
crate::dev::TAURI_CLI_BUILTIN_WATCHER_IGNORE_FILE,
);
}

let mut builder = ignore::WalkBuilder::new(dir);
Expand Down
5 changes: 0 additions & 5 deletions crates/tauri-cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,6 @@ where
if let Err(err) = builder
.format_indent(Some(12))
.filter(None, verbosity_level(verbosity_number).to_level_filter())
// golbin spams an insane amount of really technical logs on the debug level so we're reducing one level
.filter(
Some("goblin"),
verbosity_level(verbosity_number.saturating_sub(1)).to_level_filter(),
)
// handlebars is not that spammy but its debug logs are typically far from being helpful
.filter(
Some("handlebars"),
Expand Down
Loading