Move server to (temporarily) require Rust Beta or stable 1.31+

This commit is contained in:
Lucien Greathouse
2018-11-27 10:45:02 -08:00
parent 9db31c9191
commit 6617b8b6c4
6 changed files with 15 additions and 8 deletions

View File

@@ -25,12 +25,15 @@ matrix:
- cd plugin - cd plugin
- luacov-coveralls -e $TRAVIS_BUILD_DIR/lua_install - luacov-coveralls -e $TRAVIS_BUILD_DIR/lua_install
- language: rust # Stable builds can be re-enabled after 2018-12-06, when Rust 1.31 is stable
rust: stable
# - language: rust
# rust: stable
# script:
# - cd server
# - cargo test --verbose
script:
- cd server
- cargo test --verbose
- language: rust - language: rust
rust: beta rust: beta

View File

@@ -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. 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 ## 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! Pull requests are welcome!

View File

@@ -5,6 +5,7 @@ authors = ["Lucien Greathouse <me@lpghatguy.com>"]
description = "A tool to create robust Roblox projects" description = "A tool to create robust Roblox projects"
license = "MIT" license = "MIT"
repository = "https://github.com/LPGhatguy/rojo" repository = "https://github.com/LPGhatguy/rojo"
edition = "2018"
[lib] [lib]
name = "librojo" name = "librojo"

View File

@@ -1,7 +1,7 @@
use std::path::PathBuf; use std::path::PathBuf;
use std::process; use std::process;
use project::Project; use crate::project::Project;
pub fn init(project_path: &PathBuf) { pub fn init(project_path: &PathBuf) {
match Project::init(project_path) { match Project::init(project_path) {

View File

@@ -4,7 +4,7 @@ use std::{
sync::Arc, sync::Arc,
}; };
use ::{ use crate::{
project::Project, project::Project,
web::Server, web::Server,
session::Session, session::Session,

View File

@@ -5,6 +5,7 @@ use std::{
io, io,
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use serde_json; use serde_json;
pub static PROJECT_FILENAME: &'static str = "roblox-project.json"; pub static PROJECT_FILENAME: &'static str = "roblox-project.json";