Update depenendencies

Cargo.toml

@@ -58,8 +58,8 @@ tokio-tcp = { version = "0.1", optional = true }
 compiletest_rs = { version = "0.3", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rand = { version = "0.6", optional = true }
-rand_xorshift = { version = "0.1", optional = true }
+rand = { version = "0.7", optional = true }
+rand_xorshift = { version = "0.2", optional = true }
 
 [build-dependencies]
 gluon_base = { path = "base", version = "0.12.0" } # GLUON
@@ -73,7 +73,7 @@ criterion = "0.2"
 tensile = "0.4"
 collect-mac = "0.1.0"
 env_logger = "0.6"
-pretty_assertions = "0.5"
+pretty_assertions = "0.6"
 futures-cpupool = "0.1.8"
 tokio = "0.1.7"
 tokio-retry = "0.2"
@@ -88,7 +88,7 @@ serde_derive_state = { version = "0.4.0" }
 serde_json = "1.0.0"
 bincode = "1"
 
-pulldown-cmark = "0.2"
+pulldown-cmark = "0.5"
 
 gluon_completion = { path = "completion", version = "0.12.0" } # GLUON
 gluon_codegen = { path = "codegen", version = "0.12.0" } # GLUON

base/Cargo.toml

@@ -29,7 +29,6 @@ ordered-float = "1"
 codespan = "0.3"
 codespan-reporting = "0.3"
 either = "1"
-stable_deref_trait = "1"
 vec_map = "0.8"
 
 serde = { version = "1.0.0", features = ["rc"], optional = true }
@@ -38,7 +37,7 @@ serde_derive = { version = "1.0.0", optional = true }
 serde_derive_state = { version = "0.4.0", optional = true }
 
 [dev-dependencies]
-pretty_assertions = "0.5"
+pretty_assertions = "0.6"
 
 [features]
 serialization = ["serde", "serde_state", "serde_derive", "serde_derive_state"]

base/src/kind.rs

@@ -4,8 +4,6 @@ use std::sync::Arc;
 
 use pretty::{Doc, DocAllocator, DocBuilder};
 
-use stable_deref_trait::StableDeref;
-
 use crate::ast::EmptyEnv;
 use crate::symbol::{Symbol, SymbolRef};
 use crate::types::{ToDoc, Walker};
@@ -171,8 +169,6 @@ impl ArcKind {
     }
 }
 
-unsafe impl StableDeref for ArcKind {}
-
 impl Deref for ArcKind {
     type Target = Kind;
 

base/src/types/mod.rs

@@ -16,8 +16,6 @@ use pretty::{Arena, Doc, DocAllocator, DocBuilder};
 
 use smallvec::SmallVec;
 
-use stable_deref_trait::StableDeref;
-
 use itertools::Itertools;
 
 use crate::{
@@ -1353,9 +1351,6 @@ impl<Id> fmt::Pointer for ArcType<Id> {
     }
 }
 
-// Safe since `Arc` implements it
-unsafe impl<Id> StableDeref for ArcType<Id> {}
-
 impl<Id> Borrow<Type<Id, ArcType<Id>>> for ArcType<Id> {
     fn borrow(&self) -> &Type<Id, ArcType<Id>> {
         self

check/Cargo.toml

@@ -22,14 +22,13 @@ itertools = "0.8"
 union-find = "0.3.1"
 pretty = "0.5"
 smallvec = "0.6"
-rpds = "0.5"
-stable_deref_trait = "1"
+rpds = "0.6"
 quick-error = "1"
 
 codespan = "0.3"
 codespan-reporting = "0.3"
 
-strsim = "0.8.0"
+strsim = "0.9.0"
 
 gluon_base = { path = "../base", version = "0.12.0" } # GLUON
 gluon_codegen = { path = "../codegen", version = "0.12.0" } # GLUON
@@ -42,5 +41,5 @@ gluon_format = { path = "../format", version = ">=0.9" }
 
 collect-mac = "0.1.0"
 difference = "2"
-pretty_assertions = "0.5"
+pretty_assertions = "0.6"
 

doc/Cargo.toml

@@ -15,17 +15,17 @@ documentation = "https://docs.rs/gluon"
 clap = "2.22.0"
 env_logger = "0.6"
 failure = { version = "0.1", features = ["backtrace"] }
-handlebars = "1.0.0-beta.4"
+handlebars = "2"
 itertools = "0.8"
 lazy_static = "1"
 log = "0.4"
-opener = "0.3"
+opener = "0.4"
 pretty = "0.5"
-pulldown-cmark = "0.2"
+pulldown-cmark = "0.5"
 rayon = "1"
 regex = "1"
 structopt = "0.2"
-walkdir = "1"
+walkdir = "2"
 
 serde = "1.0.0"
 serde_derive = "1.0.0"

format/Cargo.toml

@@ -22,7 +22,7 @@ gluon_base = { path = "../base", version = "0.12.0" } # GLUON
 [dev-dependencies]
 env_logger = "0.6"
 difference = "2"
-pretty_assertions = "0.5"
+pretty_assertions = "0.6"
 gluon_base = { path = "../base", version = "0.12.0" } # GLUON
 gluon = { path = "..", version = ">=0.9" }
 

parser/Cargo.toml

@@ -32,7 +32,7 @@ codespan-reporting = "0.3"
 [dev-dependencies]
 env_logger = "0.6"
 difference = "2"
-pretty_assertions = "0.5"
+pretty_assertions = "0.6"
 
 [build-dependencies]
 lalrpop = "0.17"

repl/Cargo.toml

@@ -38,8 +38,8 @@ structopt = "0.2"
 structopt-derive = "0.2"
 log = "0.4"
 env_logger = { version = "0.6", optional = true }
-lazy_static = "0.2.0"
-rustyline = "1.0.0"
+lazy_static = "1"
+rustyline = "5"
 walkdir = "2"
 codespan = "0.3"
 codespan-reporting = "0.3"
@@ -49,7 +49,7 @@ serde = "1"
 serde_derive = "1"
 
 [dev-dependencies]
-pretty_assertions = "0.5"
+pretty_assertions = "0.6"
 
 [target.'cfg(unix)'.dev-dependencies]
 rexpect = "0.3.0"

repl/src/repl.rs

@@ -167,8 +167,21 @@ fn complete(thread: &Thread, name: &str, fileinput: &str, pos: usize) -> GluonRe
 
 struct Completer(RootedThread);
 
+impl rustyline::Helper for Completer {}
+
+impl rustyline::hint::Hinter for Completer {}
+
+impl rustyline::highlight::Highlighter for Completer {}
+
 impl rustyline::completion::Completer for Completer {
-    fn complete(&self, line: &str, pos: usize) -> rustyline::Result<(usize, Vec<String>)> {
+    type Candidate = String;
+
+    fn complete(
+        &self,
+        line: &str,
+        pos: usize,
+        _: &rustyline::Context,
+    ) -> rustyline::Result<(usize, Vec<String>)> {
         let result = complete(&self.0, "<repl>", line, pos);
 
         // Get the start of the completed identifier
@@ -249,7 +262,7 @@ fn new_editor(vm: WithVM<()>) -> IO<Editor> {
     if let Err(err) = history_result {
         warn!("Unable to load history: {}", err);
     }
-    editor.set_completer(Some(Completer(vm.vm.root_thread())));
+    editor.set_helper(Some(Completer(vm.vm.root_thread())));
     IO::Value(Editor {
         editor: Mutex::new(editor),
     })

vm/Cargo.toml

@@ -21,7 +21,7 @@ bitflags = "1.0.0"
 codespan = "0.3"
 collect-mac = "0.1.0"
 crossbeam-utils = "0.6"
-frunk_core = "0.2"
+frunk_core = "0.3"
 futures = "0.1.0"
 itertools = "0.8"
 log = "0.4"
@@ -48,7 +48,7 @@ lalrpop = { version = "0.17", optional = true }
 
 [dev-dependencies]
 env_logger = "0.6"
-pretty_assertions = "0.5"
+pretty_assertions = "0.6"
 
 # HACK Trick crates.io into letting letting this be published with a dependency on gluon
 # (which requires gluon_vm to be published)