merge both crates for publish

wiseaidev · Jan 18, 2024 · 7ff53c6 · 7ff53c6
1 parent f24b5fc
commit 7ff53c6
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 28 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,14 +21,6 @@ clap = { version = "4.4.12", features = ["derive"] , optional = true }
 dirs = "5.0.1"
 once_cell = "1.19.0"
 
-[build-dependencies]
-codegen = { path = "codegen", version = "0.1.0" }
-
-[workspace]
-members = [
-    "codegen",
-]
-
 [features]
 cli = ["clap"]
 

diff --git a/build.rs b/build.rs
@@ -1,5 +1,8 @@
-#[path = "codegen/src/code_gen.rs"]
-pub mod code_gen;
+#[path = "src/codegen.rs"]
+pub mod codegen;
+
+#[path = "src/names.rs"]
+pub mod names;
 
 use codegen::run;
 

diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml
diff --git a/codegen/src/lib.rs b/codegen/src/lib.rs
diff --git a/codegen/src/code_gen.rs → src/codegen.rs b/codegen/src/code_gen.rs → src/codegen.rs
@@ -1,11 +1,11 @@
 use crate::names::_name_to_enum_name;
 use std::fs;
 
-const NAMES_DATA: &str = include_str!("../countries-names.txt");
-const CODES_2_DATA: &str = include_str!("../countries-two.txt");
-const CODES_3_DATA: &str = include_str!("../countries-three.txt");
-const COUNTRIES_TO_CONTINENTS: &str = include_str!("../countries-to-continents.txt");
-const DMA: &str = include_str!("../dma.txt");
+const NAMES_DATA: &str = include_str!("countries-names.txt");
+const CODES_2_DATA: &str = include_str!("countries-two.txt");
+const CODES_3_DATA: &str = include_str!("countries-three.txt");
+const COUNTRIES_TO_CONTINENTS: &str = include_str!("countries-to-continents.txt");
+const DMA: &str = include_str!("dma.txt");
 
 trait PushMut<T> {
     fn add(self, item: T) -> Self;

diff --git a/codegen/countries-names.txt → src/countries-names.txt b/codegen/countries-names.txt → src/countries-names.txt
diff --git a/codegen/countries-three.txt → src/countries-three.txt b/codegen/countries-three.txt → src/countries-three.txt
diff --git a/codegen/countries-to-continents.txt → src/countries-to-continents.txt b/codegen/countries-to-continents.txt → src/countries-to-continents.txt
diff --git a/codegen/countries-two.txt → src/countries-two.txt b/codegen/countries-two.txt → src/countries-two.txt
diff --git a/codegen/dma.txt → src/dma.txt b/codegen/dma.txt → src/dma.txt
diff --git a/src/lib.rs b/src/lib.rs
@@ -65,7 +65,5 @@ pub mod errors;
 pub mod geo_ip_reader;
 pub mod time_zones;
 pub mod utils;
-#[path = "../codegen/src/code_gen.rs"]
-pub mod code_gen;
-#[path = "../codegen/src/names.rs"]
+pub mod codegen;
 pub mod names;
diff --git a/codegen/src/names.rs → src/names.rs b/codegen/src/names.rs → src/names.rs