Merge branch 'master' into pr/Andrew15-5/1903

This commit is contained in:
Evan Almloff committed 2024-02-06 10:28:49 -06:00
commit 1909b05412
517 files changed
+17143 -20683

No files matched your search

+1 -1
View File
@@ -15,7 +15,7 @@ serde_json = "1.0.79"
toml = { version = "0.5.8", optional = true }
cargo_toml = { version = "0.16.0", optional = true }
once_cell = "1.18.0"
tracing.workspace = true
tracing = { workspace = true }
# bundling
tauri-bundler = { version = "=1.4.0", features = ["native-tls-vendored"], optional = true }
+6 -1
View File
@@ -392,7 +392,12 @@ impl CrateConfig {
None => manifest
.bin
.iter()
.find(|b| b.name == manifest.package.as_ref().map(|pkg| pkg.name.clone()))
.find(|b| {
#[allow(clippy::useless_asref)]
let matching_bin =
b.name == manifest.package.as_ref().map(|pkg| pkg.name.clone());
matching_bin
})
.or(manifest
.bin
.iter()