From a9827da70b6402a8ea5dbfb4b0d2be24e6c3ba17 Mon Sep 17 00:00:00 2001
From: pca006132 <jl@m-labs.hk>
Date: Tue, 29 Dec 2020 10:33:21 +0800
Subject: [PATCH] moved nac3type to nac3core

---
 Cargo.lock                                       |  7 -------
 Cargo.toml                                       |  1 -
 {nac3type => nac3core}/src/inference.rs          |  2 +-
 nac3core/src/lib.rs                              |  4 ++++
 {nac3type => nac3core}/src/primitives.rs         |  2 +-
 nac3type/src/types.rs => nac3core/src/typedef.rs |  0
 nac3type/Cargo.toml                              | 10 ----------
 nac3type/src/lib.rs                              |  6 ------
 8 files changed, 6 insertions(+), 26 deletions(-)
 rename {nac3type => nac3core}/src/inference.rs (99%)
 rename {nac3type => nac3core}/src/primitives.rs (99%)
 rename nac3type/src/types.rs => nac3core/src/typedef.rs (100%)
 delete mode 100644 nac3type/Cargo.toml
 delete mode 100644 nac3type/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7966077cd3..f16dee5060 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -474,13 +474,6 @@ dependencies = [
  "rustpython-parser",
 ]
 
-[[package]]
-name = "nac3type"
-version = "0.1.0"
-dependencies = [
- "rustpython-parser",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.4"
diff --git a/Cargo.toml b/Cargo.toml
index a7cd60f8ef..938324ad75 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,5 +3,4 @@ members = [
   "nac3core",
   "nac3standalone",
   "nac3embedded",
-  "nac3type",
 ]
diff --git a/nac3type/src/inference.rs b/nac3core/src/inference.rs
similarity index 99%
rename from nac3type/src/inference.rs
rename to nac3core/src/inference.rs
index 7eb63a2325..cdd28ba64b 100644
--- a/nac3type/src/inference.rs
+++ b/nac3core/src/inference.rs
@@ -1,4 +1,4 @@
-use super::types::{Type::*, *};
+use super::typedef::{Type::*, *};
 use std::collections::HashMap;
 use std::rc::Rc;
 
diff --git a/nac3core/src/lib.rs b/nac3core/src/lib.rs
index e122233b7f..761cc82e27 100644
--- a/nac3core/src/lib.rs
+++ b/nac3core/src/lib.rs
@@ -2,6 +2,10 @@ extern crate num_bigint;
 extern crate inkwell;
 extern crate rustpython_parser;
 
+pub mod inference;
+pub mod primitives;
+pub mod typedef;
+
 use std::error::Error;
 use std::fmt;
 use std::path::Path;
diff --git a/nac3type/src/primitives.rs b/nac3core/src/primitives.rs
similarity index 99%
rename from nac3type/src/primitives.rs
rename to nac3core/src/primitives.rs
index d4593207a7..e68bdc5a2d 100644
--- a/nac3type/src/primitives.rs
+++ b/nac3core/src/primitives.rs
@@ -1,4 +1,4 @@
-use super::types::{Type::*, *};
+use super::typedef::{Type::*, *};
 use std::collections::HashMap;
 use std::rc::Rc;
 
diff --git a/nac3type/src/types.rs b/nac3core/src/typedef.rs
similarity index 100%
rename from nac3type/src/types.rs
rename to nac3core/src/typedef.rs
diff --git a/nac3type/Cargo.toml b/nac3type/Cargo.toml
deleted file mode 100644
index eb548c321e..0000000000
--- a/nac3type/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "nac3type"
-version = "0.1.0"
-authors = ["M-Labs"]
-edition = "2018"
-
-[dependencies]
-rustpython-parser = { git = "https://github.com/RustPython/RustPython", branch = "master" }
-
-
diff --git a/nac3type/src/lib.rs b/nac3type/src/lib.rs
deleted file mode 100644
index a62c270738..0000000000
--- a/nac3type/src/lib.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-extern crate rustpython_parser;
-
-pub mod types;
-pub mod inference;
-pub mod primitives;
-