Move Rojo server into root of the repository

Cargo.toml

@@ -1,8 +1,53 @@
+[package]
+name = "rojo"
+version = "0.5.0"
+authors = ["Lucien Greathouse <me@lpghatguy.com>"]
+description = "Enables professional-grade development tools for Roblox developers"
+license = "MIT"
+repository = "https://github.com/rojo-rbx/rojo"
+edition = "2018"
+
 [workspace]
 members = [
-	"server",
+    "rojo-test",
-	"rojo-test",
 ]
 
 [profile.dev]
-opt-level = 1
+opt-level = 1
+
+[lib]
+name = "librojo"
+path = "src/lib.rs"
+
+[[bin]]
+name = "rojo"
+path = "src/bin.rs"
+
+[dependencies]
+clap = "2.27"
+crossbeam-channel = "0.3.9"
+csv = "1.0"
+env_logger = "0.6"
+failure = "0.1.3"
+futures = "0.1"
+hyper = "0.12"
+jod-thread = "0.1.0"
+log = "0.4"
+maplit = "1.0.1"
+notify = "4.0"
+rbx_binary = "0.4.1"
+rbx_dom_weak = "1.9.0"
+rbx_reflection = "3.1.388"
+rbx_xml = "0.11.0"
+regex = "1.0"
+ritz = "0.1.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+uuid = { version = "0.7", features = ["v4", "serde"] }
+
+[dev-dependencies]
+lazy_static = "1.2"
+paste = "0.1"
+pretty_assertions = "0.6.1"
+tempfile = "3.0"
+walkdir = "2.1"

rojo-test/Cargo.toml

@@ -11,4 +11,4 @@ paste = "0.1.5"
 tempfile = "3.1.0"
 
 # We execute Rojo via std::process::Command, so depend on it so it's built!
-rojo = { path = "../server" }
+rojo = { path = ".." }

server/Cargo.toml

@@ -1,49 +0,0 @@
-[package]
-name = "rojo"
-version = "0.5.0"
-authors = ["Lucien Greathouse <me@lpghatguy.com>"]
-description = "Enables professional-grade development tools for Roblox developers"
-license = "MIT"
-repository = "https://github.com/rojo-rbx/rojo"
-edition = "2018"
-
-[features]
-default = []
-server-plugins = []
-
-[lib]
-name = "librojo"
-path = "src/lib.rs"
-
-[[bin]]
-name = "rojo"
-path = "src/bin.rs"
-
-[dependencies]
-clap = "2.27"
-crossbeam-channel = "0.3.9"
-csv = "1.0"
-env_logger = "0.6"
-failure = "0.1.3"
-futures = "0.1"
-hyper = "0.12"
-jod-thread = "0.1.0"
-log = "0.4"
-maplit = "1.0.1"
-notify = "4.0"
-rbx_binary = "0.4.1"
-rbx_dom_weak = "1.9.0"
-rbx_reflection = "3.1.388"
-rbx_xml = "0.11.0"
-regex = "1.0"
-ritz = "0.1.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-uuid = { version = "0.7", features = ["v4", "serde"] }
-
-[dev-dependencies]
-lazy_static = "1.2"
-paste = "0.1"
-pretty_assertions = "0.6.1"
-tempfile = "3.0"
-walkdir = "2.1"

tests/read_projects.rs

@@ -13,7 +13,7 @@ use librojo::project::{Project, ProjectNode};
 
 lazy_static! {
     static ref TEST_PROJECTS_ROOT: PathBuf =
-        { Path::new(env!("CARGO_MANIFEST_DIR")).join("../test-projects") };
+        { Path::new(env!("CARGO_MANIFEST_DIR")).join("test-projects") };
 }
 
 #[test]