From 87e68988c8fba18106a20d582a90c1182e7226c3 Mon Sep 17 00:00:00 2001 From: greg Date: Tue, 1 Jan 2019 02:22:12 -0800 Subject: [PATCH] Update some dependencies --- schala-repl/Cargo.toml | 9 ++++----- schala-repl/src/lib.rs | 4 ++-- schala-repl/src/webapp.rs | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/schala-repl/Cargo.toml b/schala-repl/Cargo.toml index 58a2b96..999510a 100644 --- a/schala-repl/Cargo.toml +++ b/schala-repl/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" authors = ["greg "] [dependencies] -llvm-sys = "*" -take_mut = "0.1.3" +llvm-sys = "70.0.2" +take_mut = "0.2.2" itertools = "0.5.8" getopts = "*" lazy_static = "0.2.8" @@ -14,9 +14,8 @@ colored = "1.5" serde = "1.0.15" serde_derive = "1.0.15" serde_json = "1.0.3" -rocket = "0.3.13" -rocket_codegen = "0.3.13" -rocket_contrib = "0.3.13" +rocket = "0.4.0" +rocket_contrib = "0.4.0" phf = "0.7.12" includedir = "0.2.0" linefeed = "0.5.0" diff --git a/schala-repl/src/lib.rs b/schala-repl/src/lib.rs index a9bfb25..cfc1fd1 100644 --- a/schala-repl/src/lib.rs +++ b/schala-repl/src/lib.rs @@ -1,7 +1,6 @@ #![feature(link_args)] -#![feature(slice_patterns, box_patterns, box_syntax)] +#![feature(slice_patterns, box_patterns, box_syntax, proc_macro_hygiene, decl_macro)] #![feature(plugin)] -#![plugin(rocket_codegen)] extern crate getopts; extern crate linefeed; extern crate itertools; @@ -10,6 +9,7 @@ extern crate colored; #[macro_use] extern crate serde_derive; extern crate serde_json; +#[macro_use] extern crate rocket; extern crate rocket_contrib; extern crate includedir; diff --git a/schala-repl/src/webapp.rs b/schala-repl/src/webapp.rs index b4f01a1..6947019 100644 --- a/schala-repl/src/webapp.rs +++ b/schala-repl/src/webapp.rs @@ -2,7 +2,7 @@ use rocket; use rocket::State; use rocket::response::Content; use rocket::http::ContentType; -use rocket_contrib::Json; +use rocket_contrib::json::Json; use language::{ProgrammingLanguageInterface, EvalOptions}; use WEBFILES; use ::PLIGenerator;