Update dependencies

gluon-lang · Aug 10, 2020 · b8749f6 · b8749f6
1 parent b1b7fa3
commit b8749f6
Show file tree

Hide file tree

Showing 8 changed files with 299 additions and 399 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/base/Cargo.toml b/base/Cargo.toml
@@ -17,21 +17,21 @@ travis-ci = { repository = "gluon-lang/gluon" }
 
 [dependencies]
 bitflags = "1"
-hashbrown = "0.6"
+hashbrown = "0.8"
 log = "0.4"
 quick-error = "1.0.0"
 fnv = "1.0.3"
 pretty = "0.10"
-smallvec = "0.6"
+smallvec = "1"
 collect-mac = "0.1.0"
 anymap = { version = "0.12.0", optional = true }
 itertools = "0.9"
-ordered-float = "1"
+ordered-float = "2"
 codespan = "0.9"
 codespan-reporting = "0.9"
 either = "1"
 vec_map = "0.8"
-typed-arena = "1"
+typed-arena = "2"
 
 gluon_codegen = { version = "0.16.1", path = "../codegen" } # GLUON
 

diff --git a/check/Cargo.toml b/check/Cargo.toml
@@ -17,18 +17,18 @@ travis-ci = { repository = "gluon-lang/gluon" }
 
 [dependencies]
 collect-mac = "0.1.0"
-ena = "0.13"
+ena = "0.14"
 log = "0.4"
 itertools = "0.9"
 pretty = "0.10"
-smallvec = "0.6"
+smallvec = "1"
 rpds = "0.7"
 quick-error = "1"
 
 codespan = "0.9"
 codespan-reporting = "0.9"
 
-strsim = "0.9.0"
+strsim = "0.10"
 
 gluon_base = { path = "../base", version = "0.16.1" } # GLUON
 gluon_codegen = { path = "../codegen", version = "0.16.1" } # GLUON

diff --git a/parser/Cargo.toml b/parser/Cargo.toml
@@ -23,9 +23,8 @@ itertools = "0.9"
 quick-error = "1.0.0"
 lalrpop-util = "0.19"
 log = "0.4"
-pretty = "0.9"
 gluon_base = { path = "../base", version = "0.16.1" } # GLUON
-ordered-float = "1"
+ordered-float = "2"
 codespan = "0.9"
 codespan-reporting = "0.9"
 

diff --git a/parser/src/grammar.lalrpop b/parser/src/grammar.lalrpop
@@ -1,6 +1,6 @@
 use std::{str::FromStr, mem};
 
-use crate::itertools::{Either, Itertools};
+use itertools::{Either, Itertools};
 
 use crate::base::{
     ast::{self, Alternative, Argument, Array, AstType, Do, Expr, ExprField, KindedIdent, Lambda, Literal, Pattern,
@@ -13,7 +13,7 @@ use crate::base::{
 
 use crate::{ReplLine, Variant, new_ident};
 use crate::token::{Token, BorrowedToken, StringLiteral};
-use crate::ordered_float::NotNan;
+use ordered_float::NotNan;
 
 use crate::{Error, ErrorEnv, FieldExpr, MutIdentEnv, TempVecs, TempVecStart, Slice};
 

diff --git a/parser/src/lib.rs b/parser/src/lib.rs
@@ -3,17 +3,11 @@
 //! string interner and therefore also garbage collector needs to compiled before the parser.
 #![doc(html_root_url = "https://docs.rs/gluon_parser/0.16.1")] // # GLUON
 
-extern crate codespan;
-extern crate codespan_reporting;
-extern crate collect_mac;
 extern crate gluon_base as base;
-extern crate itertools;
 #[macro_use]
 extern crate lalrpop_util;
 #[macro_use]
 extern crate log;
-extern crate ordered_float;
-extern crate pretty;
 #[macro_use]
 extern crate quick_error;
 

diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -24,21 +24,21 @@ codespan-reporting = "0.9"
 collect-mac = "0.1.0"
 downcast-rs = "1"
 difference = { version = "2", optional = true }
-crossbeam-utils = "0.6"
+crossbeam-utils = "0.7"
 frunk_core = "0.3"
 futures = { version = "0.3.1", features = ["compat", "async-await"] }
 itertools = "0.9"
 lalrpop-util = { version = "0.19", optional = true }
 log = "0.4"
-ordered-float = "1"
-parking_lot = "0.9"
-petgraph = "0.4"
+ordered-float = "2"
+parking_lot = "0.11"
+petgraph = "0.5"
 pretty = "0.10"
 quick-error = "1.1.0"
 regex = { version = "1", optional = true }
-smallvec = "0.6"
+smallvec = "1"
 slab = "0.4"
-typed-arena = "1.2.0"
+typed-arena = "2"
 
 serde = { version = "1.0.0", optional = true }
 serde_json = { version = "1.0.0", optional = true }

diff --git a/vm/src/core/mod.rs b/vm/src/core/mod.rs
@@ -668,7 +668,7 @@ impl<T> ArenaExt<T> for Arena<T> {
         I: IntoIterator<Item = T>,
         T: Default,
     {
-        use std::ptr;
+        use std::{mem::MaybeUninit, ptr};
 
         let iter = iter.into_iter();
 
@@ -694,7 +694,7 @@ impl<T> ArenaExt<T> for Arena<T> {
             let elems = self.alloc_uninitialized(len);
 
             {
-                let elems = elems as *mut T;
+                let elems = elems as *mut _ as *mut MaybeUninit<T>;
                 let mut fill = FillRemainingOnDrop {
                     ptr: elems as *mut T,
                     end: elems.add(len) as *mut T,
@@ -707,6 +707,7 @@ impl<T> ArenaExt<T> for Arena<T> {
                 }
             }
 
+            let elems = elems as *mut _ as *mut [T];
             &mut *elems
         }
     }
@@ -1061,7 +1062,7 @@ impl<'a, 'e> Translator<'a, 'e> {
                     let mut reordered_args = SmallVec::<[_; 16]>::new();
 
                     let mut overridden_fields = FnvMap::default();
-                    for (field, arg) in exprs.iter().zip(args.drain()) {
+                    for (field, arg) in exprs.iter().zip(args.drain(..)) {
                         let field_name = field.name.value.declared_name();
                         if base_fields.contains(field_name) {
                             overridden_fields.insert(field_name, arg);