Update to current rust

schala-lang/language/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["greg <greg.shuflin@protonmail.com>"]
 edition = "2018"
 
 [dependencies]
-itertools = "0.8.0"
+itertools = "0.10"
 take_mut = "0.2.2"
 maplit = "1.0.1"
 lazy_static = "1.3.0"

schala-lang/language/src/eval.rs

@@ -2,8 +2,6 @@ use std::rc::Rc;
 use std::fmt::Write;
 use std::io;
 
-use itertools::Itertools;
-
 use crate::schala::SymbolTableHandle;
 use crate::util::ScopeStack;
 use crate::reduced_ast::{BoundVars, ReducedAST, Stmt, Expr, Lit, Func, Alternative, Subpattern};

schala-lang/language/src/lib.rs

@@ -1,6 +1,6 @@
 #![feature(trace_macros)]
 //#![feature(unrestricted_attribute_tokens)]
-#![feature(slice_patterns, box_patterns, box_syntax)]
+#![feature(box_patterns, box_syntax)]
 
 //! `schala-lang` is where the Schala programming language is actually implemented. 
 //! It defines the `Schala` type, which contains the state for a Schala REPL, and implements

schala-lang/language/src/schala.rs

@@ -195,7 +195,7 @@ fn eval(input: reduced_ast::ReducedAST, handle: &mut Schala, comp: Option<&mut P
     .collect();
 
   let eval_output: Result<String, String> = text_output
-    .map(|v| { v.into_iter().intersperse(format!("\n")).collect() });
+    .map(|v| { Iterator::intersperse(v.into_iter(), "\n".to_owned()).collect() });
   eval_output
 }
 

schala-lang/language/src/tokenizing.rs

@@ -123,8 +123,7 @@ type CharData = (usize, usize, char);
 pub fn tokenize(input: &str) -> Vec<Token> {
   let mut tokens: Vec<Token> = Vec::new();
 
-  let mut input = input.lines().enumerate()
+  let mut input = Iterator::intersperse(input.lines().enumerate(), (0, "\n"))
-      .intersperse((0, "\n"))
       .flat_map(|(line_idx, ref line)| {
           line.chars().enumerate().map(move |(ch_idx, ch)| (line_idx, ch_idx, ch))
       })

schala-repl/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 llvm-sys = "70.0.2"
 take_mut = "0.2.2"
-itertools = "0.5.8"
+itertools = "0.10"
 getopts = "0.2.18"
 lazy_static = "0.2.8"
 maplit = "*"

schala-repl/src/lib.rs

@@ -1,5 +1,4 @@
-#![feature(link_args)]
+#![feature(box_patterns, box_syntax, proc_macro_hygiene, decl_macro)]
-#![feature(slice_patterns, box_patterns, box_syntax, proc_macro_hygiene, decl_macro)]
 #![feature(plugin)]
 extern crate getopts;
 extern crate linefeed;

schala-repl/src/repl/directive_actions.rs

@@ -1,7 +1,6 @@
 use super::{Repl, InterpreterDirectiveOutput};
 use crate::repl::help::help;
 use crate::language::{LangMetaRequest, LangMetaResponse, DebugAsk, DebugResponse}; 
-use itertools::Itertools;
 use std::fmt::Write as FmtWrite;
 
 #[derive(Debug, Clone)]