diff --git a/src/routing/scripting.rs b/src/routing/scripting.rs index d8149a33028b5456d9cc86d5f5c2c471bf71b75d..8db3b91926ef6d35878ee25afda2b4f87b286f91 100644 --- a/src/routing/scripting.rs +++ b/src/routing/scripting.rs @@ -1,4 +1,3 @@ -use routing::request; use server::LuaRuntime; use rlua::{Lua}; use scripting::{run_script, ScriptResponse}; @@ -38,4 +37,4 @@ impl <'form> FromForm<'form> for ScriptParams { pub fn route_script(params: ScriptParams, runtime: LuaRuntime) -> ScriptResponse { let lua: Lua = runtime.into(); run_script(format!("example/.swerve/{}", params.script_name), &lua, params.script_params).unwrap_or_else(|| ScriptResponse::default()) -} \ No newline at end of file +} diff --git a/src/scripting/run_script.rs b/src/scripting/run_script.rs index d9992454a88cdabe2277998c93d2e0f12075f801..53778edd796e3f65d143f1c2c17641d09658d4b9 100644 --- a/src/scripting/run_script.rs +++ b/src/scripting/run_script.rs @@ -2,11 +2,11 @@ use std::convert::AsRef; use std::path::Path; use std::fs::File; use std::io::Read; -use rlua::{Lua, UserData}; +use rlua::Lua; use scripting::ScriptResponse; use std::collections::HashMap; -pub fn run_script<P: AsRef<Path>>(path: P, mut lua: &Lua, params: HashMap<String, String>) -> Option<ScriptResponse> { +pub fn run_script<P: AsRef<Path>>(path: P, lua: &Lua, params: HashMap<String, String>) -> Option<ScriptResponse> { let mut file = File::open(&path).unwrap(); let mut buf = String::new(); diff --git a/src/scripting/script_response.rs b/src/scripting/script_response.rs index 06cff940dcaaf0cad4b685bba27d9a6e8c606766..7ae702bfb6815e1fcf52e744fec38b67e54cc361 100644 --- a/src/scripting/script_response.rs +++ b/src/scripting/script_response.rs @@ -1,8 +1,8 @@ -use rlua::{UserData, UserDataMethods, Table}; +use rlua::{UserData, UserDataMethods}; use rocket::Request; use rocket::http::Status; -use rocket::response::{Response, Responder, ResponseBuilder}; +use rocket::response::{Response, Responder}; use std::io::Cursor; use std::default::Default; @@ -58,4 +58,4 @@ impl <'r>Responder<'r> for ScriptResponse { } r.ok() } -} \ No newline at end of file +} diff --git a/src/server/lua.rs b/src/server/lua.rs index 5904dd410f2f4200b5e56b1d441f698860828f8b..299584af8474b5f806882f770f9da06d2feedb83 100644 --- a/src/server/lua.rs +++ b/src/server/lua.rs @@ -1,10 +1,9 @@ -use rlua::{Lua, Result as LuaResult, FromLua}; +use rlua::{Lua, Result as LuaResult}; use rocket::{Outcome, http}; use rocket::request::{FromRequest, Request}; use std::convert::{Into, AsRef, AsMut}; -use scripting; -use serde::Serialize; use std::collections::HashMap; +use scripting; const LIB_JSON_ENCODE: &'static str = include_str!("../scripts/json.lua"); @@ -74,4 +73,4 @@ pub fn create_runtime(with_debug: bool) -> LuaResult<LuaRuntime> { } Ok(LuaRuntime(runtime)) -} \ No newline at end of file +}