Skip to content

Commit ea586ca

Browse files
committed
fix: revert rust-embed to 6.4
1 parent 299bf05 commit ea586ca

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

.changes/rust-embed-revert.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"create-tauri-app": "patch"
3+
---
4+
5+
Revert back to `rust-embed` 6.4.

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ path = "src/main.rs"
2020
anyhow = "1.0"
2121
dialoguer = "0.10.2"
2222
pico-args = "0.5.0"
23-
rust-embed = { version = "6.5", features = [ "compression", "interpolate-folder-path" ] }
23+
rust-embed = { version = "6.4", features = [ "compression", "interpolate-folder-path" ] }

packages/cli/src/template.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,6 @@ impl<'a> Template {
120120
let manifest = Manifest::parse(&manifest_str)?;
121121

122122
let write_file = |file: &str| -> anyhow::Result<()> {
123-
let fragment_file = Fragments::get(file).unwrap();
124-
if fragment_file.metadata.is_dir() {
125-
return Ok(());
126-
}
127-
128123
let manifest = manifest.clone();
129124

130125
// remove the first component, which is certainly the fragment directory they were in before getting embeded into the binary
@@ -159,7 +154,7 @@ impl<'a> Template {
159154
_ => &file_name,
160155
};
161156

162-
let mut data = fragment_file.data.to_vec();
157+
let mut data = Fragments::get(file).unwrap().data.to_vec();
163158

164159
// Only modify specific set of files
165160
if [
@@ -211,8 +206,8 @@ impl<'a> Template {
211206
path::PathBuf::from(e.to_string())
212207
.components()
213208
.next()
214-
.map(|c| c.as_os_str())
215-
.unwrap_or_default()
209+
.unwrap()
210+
.as_os_str()
216211
== "base"
217212
}) {
218213
write_file(&file)?;
@@ -223,8 +218,8 @@ impl<'a> Template {
223218
path::PathBuf::from(e.to_string())
224219
.components()
225220
.next()
226-
.map(|c| c.as_os_str())
227-
.unwrap_or_default()
221+
.unwrap()
222+
.as_os_str()
228223
== path::PathBuf::from(format!("fragment-{}", self))
229224
}) {
230225
write_file(&file)?;

0 commit comments

Comments
 (0)