From f8554b3402e14ddb2098f9235d655f55556315cb Mon Sep 17 00:00:00 2001
From: William Venner <william@venner.io>
Date: Thu, 27 Jan 2022 19:42:50 +0000
Subject: [PATCH] Remove annoying circular dependency

---
 Cargo.lock      | 43 +------------------------------------------
 gmod/Cargo.toml |  2 --
 gmod/src/lib.rs |  3 ---
 3 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index afca15f..52923da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -107,26 +107,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "gmod"
-version = "12.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3573d8d390480fc201b868996f348812fda75351ffd12efc140a1df3459a944"
-dependencies = [
- "cfg_table",
- "cstr",
- "ctor",
- "detour",
- "fn_abi",
- "fn_has_this",
- "fn_type_alias",
- "gmod-macros 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static",
- "libloading",
- "null_fn",
- "skidscan",
-]
-
 [[package]]
 name = "gmod"
 version = "14.0.1"
@@ -138,8 +118,7 @@ dependencies = [
  "fn_abi",
  "fn_has_this",
  "fn_type_alias",
- "gmod-macros 2.0.1",
- "gmserverplugin",
+ "gmod-macros",
  "lazy_static",
  "libloading",
  "null_fn",
@@ -155,26 +134,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "gmod-macros"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f379e64e2b37dc89becb8ac4e1a67211a1a8989b866a71d8365dc16459224a8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "gmserverplugin"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671fbd0ef21d6ee8c4b980ec8a814c4f0ca87317bc7efbaa97413741369bb828"
-dependencies = [
- "gmod 12.0.1",
-]
-
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
diff --git a/gmod/Cargo.toml b/gmod/Cargo.toml
index 6a63971..d8109ef 100644
--- a/gmod/Cargo.toml
+++ b/gmod/Cargo.toml
@@ -12,12 +12,10 @@ categories = ["api-bindings", "external-ffi-bindings", "game-development", "deve
 [features]
 default = ["hax"]
 hax = ["ctor", "skidscan", "detour", "fn_type_alias", "fn_abi", "cfg_table", "null_fn", "fn_has_this"]
-server-plugin = ["gmserverplugin"]
 gmcl = ["gmod-macros/gmcl"]
 
 [dependencies]
 gmod-macros = { version = "2.0.1", path = "../gmod-macros" }
-gmserverplugin = { version = "2", optional = true }
 
 libloading = "0"
 cstr = "0"
diff --git a/gmod/src/lib.rs b/gmod/src/lib.rs
index 83e5fbb..c6cc96b 100644
--- a/gmod/src/lib.rs
+++ b/gmod/src/lib.rs
@@ -24,9 +24,6 @@ mod haxports {
 #[cfg(feature = "hax")]
 pub use haxports::*;
 
-#[cfg(feature = "server-plugin")]
-pub use gmserverplugin as serverplugin;
-
 /// Lua interface
 pub mod lua;