greg
/
schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't need mutex, kill it

This commit is contained in:
greg 2017-10-29 04:04:54 -07:00
parent 277e039251
commit 5ebc96daa7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@ -38,7 +38,7 @@ include!(concat!(env!("OUT_DIR"), "/static.rs"));
#[link_args="-ltinfo"] #[link_args="-ltinfo"]
extern { } extern { }
type PLIGenerator = Box<Fn() -> Box<ProgrammingLanguageInterface> + Send>; type PLIGenerator = Box<Fn() -> Box<ProgrammingLanguageInterface> + Send + Sync>;
fn main() { fn main() {
let languages: Vec<Box<ProgrammingLanguageInterface>> = let languages: Vec<Box<ProgrammingLanguageInterface>> =

7
src/webapp.rs
View File

@ -6,7 +6,6 @@ use rocket_contrib::Json;
use language::{ProgrammingLanguageInterface, EvalOptions}; use language::{ProgrammingLanguageInterface, EvalOptions};
use WEBFILES; use WEBFILES;
use ::PLIGenerator; use ::PLIGenerator;
use std::sync::Mutex;
#[get("/")] #[get("/")]
fn index() -> Content<String> { fn index() -> Content<String> {
@ -33,12 +32,12 @@ struct Output {
} }
#[post("/input", format = "application/json", data = "<input>")] #[post("/input", format = "application/json", data = "<input>")]
fn interpreter_input(input: Json<Input>, schala_gen: State<Mutex<PLIGenerator>>) -> Json<Output> { fn interpreter_input(input: Json<Input>, schala_gen: State<PLIGenerator>) -> Json<Output> {
let mut schala: Box<ProgrammingLanguageInterface> = schala_gen.lock().unwrap()(); let mut schala: Box<ProgrammingLanguageInterface> = schala_gen();
let code_output = schala.evaluate_in_repl(&input.source, &EvalOptions::default()); let code_output = schala.evaluate_in_repl(&input.source, &EvalOptions::default());
Json(Output { text: code_output.to_string() }) Json(Output { text: code_output.to_string() })
} }
pub fn web_main(language_generators: Vec<Box<ProgrammingLanguageInterface>>, func: PLIGenerator) { pub fn web_main(language_generators: Vec<Box<ProgrammingLanguageInterface>>, func: PLIGenerator) {
rocket::ignite().manage(Mutex::new(func)).mount("/", routes![index, js_bundle, interpreter_input]).launch(); rocket::ignite().manage(func).mount("/", routes![index, js_bundle, interpreter_input]).launch();
} }