From 6617b8b6c459d7d2a61fcf417bcf5155205cca0e Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Tue, 27 Nov 2018 10:45:02 -0800
Subject: [PATCH] Move server to (temporarily) require Rust Beta or stable
 1.31+

---
 .travis.yml                  | 13 ++++++++-----
 README.md                    |  4 +++-
 server/Cargo.toml            |  1 +
 server/src/commands/init.rs  |  2 +-
 server/src/commands/serve.rs |  2 +-
 server/src/project.rs        |  1 +
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b83c1564..ba811ce8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,12 +25,15 @@ matrix:
         - cd plugin
         - luacov-coveralls -e $TRAVIS_BUILD_DIR/lua_install
 
-    - language: rust
-      rust: stable
+    # Stable builds can be re-enabled after 2018-12-06, when Rust 1.31 is stable
+
+    # - language: rust
+    #   rust: stable
+
+    #   script:
+    #     - cd server
+    #     - cargo test --verbose
 
-      script:
-        - cd server
-        - cargo test --verbose
     - language: rust
       rust: beta
 
diff --git a/README.md b/README.md
index 99a54a58..df944095 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,9 @@ Here are a few, if you're looking for alternatives or supplements to Rojo:
 If you use a plugin that _isn't_ Rojo for syncing code, open an issue and let me know why! I'd like Rojo to be the end-all tool so that people stop reinventing solutions to this problem.
 
 ## Contributing
-The `master` branch is undergoing a rewrite right now known as 'Epiphany'. It includes a breaking change to the project configuration format and an infrastructure overhaul.
+The `master` branch is a rewrite known as **Epiphany**. It includes a breaking change to the project configuration format and an infrastructure overhaul.
+
+Building Rojo requires the latest Rust beta in order to use **2018 Edition** features. Once Rust 1.31 is stable on **December 6, 2018**, Rojo `master` will compile on Rust stable again.
 
 Pull requests are welcome!
 
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 95369e2c..022ef5a2 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 description = "A tool to create robust Roblox projects"
 license = "MIT"
 repository = "https://github.com/LPGhatguy/rojo"
+edition = "2018"
 
 [lib]
 name = "librojo"
diff --git a/server/src/commands/init.rs b/server/src/commands/init.rs
index 05407f14..186d531c 100644
--- a/server/src/commands/init.rs
+++ b/server/src/commands/init.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 use std::process;
 
-use project::Project;
+use crate::project::Project;
 
 pub fn init(project_path: &PathBuf) {
     match Project::init(project_path) {
diff --git a/server/src/commands/serve.rs b/server/src/commands/serve.rs
index c00eec8d..d7c8e9a4 100644
--- a/server/src/commands/serve.rs
+++ b/server/src/commands/serve.rs
@@ -4,7 +4,7 @@ use std::{
     sync::Arc,
 };
 
-use ::{
+use crate::{
     project::Project,
     web::Server,
     session::Session,
diff --git a/server/src/project.rs b/server/src/project.rs
index 4d761d12..54ffa601 100644
--- a/server/src/project.rs
+++ b/server/src/project.rs
@@ -5,6 +5,7 @@ use std::{
     io,
     path::{Path, PathBuf},
 };
+
 use serde_json;
 
 pub static PROJECT_FILENAME: &'static str = "roblox-project.json";