remove rust-embed

BrettMayson · Oct 20, 2024 · 7d9ce6a · 7d9ce6a
1 parent 1a0f679
commit 7d9ce6a
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -42,7 +42,6 @@ rayon = "1.10.0"
 regex = { workspace = true }
 reqwest = { version = "0.12.8", features = ["blocking", "json"] }
 rhai = "1.19.0"
-rust-embed = "8.5.0"
 semver = "1.0.23"
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }

diff --git a/bin/src/commands/new/mod.rs b/bin/src/commands/new/mod.rs
@@ -84,15 +84,7 @@ pub fn execute(matches: &ArgMatches) -> Result<Report, Error> {
     };
 
     let license = if test_mode {
-        Some(
-            String::from_utf8(
-                Licenses::get("apl-sa.txt")
-                    .expect("apl-sa should exist")
-                    .data
-                    .to_vec(),
-            )
-            .expect("license should be utf8"),
-        )
+        Some(include_str!("../../modules/new/licenses/mit.txt").to_string())
     } else {
         Licenses::select(&author)
     };

diff --git a/bin/src/modules/new/license.rs b/bin/src/modules/new/license.rs
@@ -1,7 +1,3 @@
-use rust_embed::RustEmbed;
-
-#[derive(RustEmbed)]
-#[folder = "dist/licenses/"]
 pub struct Licenses;
 
 impl Licenses {
@@ -33,18 +29,16 @@ impl Licenses {
         }
 
         let license = match selection {
-            0 => Self::get("apl-sa.txt"),
-            1 => Self::get("apl.txt"),
-            2 => Self::get("apl-nd.txt"),
-            3 => Self::get("apache.txt"),
-            4 => Self::get("gpl-3.0.txt"),
-            5 => Self::get("mit.txt"),
-            6 => Self::get("unlicense.txt"),
+            0 => include_str!("licenses/apl-sa.txt"),
+            1 => include_str!("licenses/apl.txt"),
+            2 => include_str!("licenses/apl-nd.txt"),
+            3 => include_str!("licenses/apache.txt"),
+            4 => include_str!("licenses/gpl-3.0.txt"),
+            5 => include_str!("licenses/mit.txt"),
+            6 => include_str!("licenses/unlicense.txt"),
             _ => unreachable!(),
-        }
-        .expect("license should exist");
+        };
 
-        let license = String::from_utf8(license.data.to_vec()).expect("license should be utf8");
         Some(license.replace("{author}", author).replace(
             "{year}",
             time::OffsetDateTime::now_utc().year().to_string().as_str(),

diff --git a/bin/dist/licenses/apache.txt → bin/src/modules/new/licenses/apache.txt b/bin/dist/licenses/apache.txt → bin/src/modules/new/licenses/apache.txt
diff --git a/bin/dist/licenses/apl-nd.txt → bin/src/modules/new/licenses/apl-nd.txt b/bin/dist/licenses/apl-nd.txt → bin/src/modules/new/licenses/apl-nd.txt
diff --git a/bin/dist/licenses/apl-sa.txt → bin/src/modules/new/licenses/apl-sa.txt b/bin/dist/licenses/apl-sa.txt → bin/src/modules/new/licenses/apl-sa.txt
diff --git a/bin/dist/licenses/apl.txt → bin/src/modules/new/licenses/apl.txt b/bin/dist/licenses/apl.txt → bin/src/modules/new/licenses/apl.txt
diff --git a/bin/dist/licenses/gpl-3.0.txt → bin/src/modules/new/licenses/gpl-3.0.txt b/bin/dist/licenses/gpl-3.0.txt → bin/src/modules/new/licenses/gpl-3.0.txt
diff --git a/bin/dist/licenses/mit.txt → bin/src/modules/new/licenses/mit.txt b/bin/dist/licenses/mit.txt → bin/src/modules/new/licenses/mit.txt
diff --git a/bin/dist/licenses/unlicense.txt → bin/src/modules/new/licenses/unlicense.txt b/bin/dist/licenses/unlicense.txt → bin/src/modules/new/licenses/unlicense.txt