Skip to content

Commit b8749f6

Browse files
committed
Update dependencies
1 parent b1b7fa3 commit b8749f6

File tree

8 files changed

+299
-399
lines changed

8 files changed

+299
-399
lines changed

Cargo.lock

Lines changed: 279 additions & 373 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

base/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ travis-ci = { repository = "gluon-lang/gluon" }
1717

1818
[dependencies]
1919
bitflags = "1"
20-
hashbrown = "0.6"
20+
hashbrown = "0.8"
2121
log = "0.4"
2222
quick-error = "1.0.0"
2323
fnv = "1.0.3"
2424
pretty = "0.10"
25-
smallvec = "0.6"
25+
smallvec = "1"
2626
collect-mac = "0.1.0"
2727
anymap = { version = "0.12.0", optional = true }
2828
itertools = "0.9"
29-
ordered-float = "1"
29+
ordered-float = "2"
3030
codespan = "0.9"
3131
codespan-reporting = "0.9"
3232
either = "1"
3333
vec_map = "0.8"
34-
typed-arena = "1"
34+
typed-arena = "2"
3535

3636
gluon_codegen = { version = "0.16.1", path = "../codegen" } # GLUON
3737

check/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ travis-ci = { repository = "gluon-lang/gluon" }
1717

1818
[dependencies]
1919
collect-mac = "0.1.0"
20-
ena = "0.13"
20+
ena = "0.14"
2121
log = "0.4"
2222
itertools = "0.9"
2323
pretty = "0.10"
24-
smallvec = "0.6"
24+
smallvec = "1"
2525
rpds = "0.7"
2626
quick-error = "1"
2727

2828
codespan = "0.9"
2929
codespan-reporting = "0.9"
3030

31-
strsim = "0.9.0"
31+
strsim = "0.10"
3232

3333
gluon_base = { path = "../base", version = "0.16.1" } # GLUON
3434
gluon_codegen = { path = "../codegen", version = "0.16.1" } # GLUON

parser/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ itertools = "0.9"
2323
quick-error = "1.0.0"
2424
lalrpop-util = "0.19"
2525
log = "0.4"
26-
pretty = "0.9"
2726
gluon_base = { path = "../base", version = "0.16.1" } # GLUON
28-
ordered-float = "1"
27+
ordered-float = "2"
2928
codespan = "0.9"
3029
codespan-reporting = "0.9"
3130

parser/src/grammar.lalrpop

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{str::FromStr, mem};
22

3-
use crate::itertools::{Either, Itertools};
3+
use itertools::{Either, Itertools};
44

55
use crate::base::{
66
ast::{self, Alternative, Argument, Array, AstType, Do, Expr, ExprField, KindedIdent, Lambda, Literal, Pattern,
@@ -13,7 +13,7 @@ use crate::base::{
1313

1414
use crate::{ReplLine, Variant, new_ident};
1515
use crate::token::{Token, BorrowedToken, StringLiteral};
16-
use crate::ordered_float::NotNan;
16+
use ordered_float::NotNan;
1717

1818
use crate::{Error, ErrorEnv, FieldExpr, MutIdentEnv, TempVecs, TempVecStart, Slice};
1919

parser/src/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,11 @@
33
//! string interner and therefore also garbage collector needs to compiled before the parser.
44
#![doc(html_root_url = "https://docs.rs/gluon_parser/0.16.1")] // # GLUON
55

6-
extern crate codespan;
7-
extern crate codespan_reporting;
8-
extern crate collect_mac;
96
extern crate gluon_base as base;
10-
extern crate itertools;
117
#[macro_use]
128
extern crate lalrpop_util;
139
#[macro_use]
1410
extern crate log;
15-
extern crate ordered_float;
16-
extern crate pretty;
1711
#[macro_use]
1812
extern crate quick_error;
1913

vm/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ codespan-reporting = "0.9"
2424
collect-mac = "0.1.0"
2525
downcast-rs = "1"
2626
difference = { version = "2", optional = true }
27-
crossbeam-utils = "0.6"
27+
crossbeam-utils = "0.7"
2828
frunk_core = "0.3"
2929
futures = { version = "0.3.1", features = ["compat", "async-await"] }
3030
itertools = "0.9"
3131
lalrpop-util = { version = "0.19", optional = true }
3232
log = "0.4"
33-
ordered-float = "1"
34-
parking_lot = "0.9"
35-
petgraph = "0.4"
33+
ordered-float = "2"
34+
parking_lot = "0.11"
35+
petgraph = "0.5"
3636
pretty = "0.10"
3737
quick-error = "1.1.0"
3838
regex = { version = "1", optional = true }
39-
smallvec = "0.6"
39+
smallvec = "1"
4040
slab = "0.4"
41-
typed-arena = "1.2.0"
41+
typed-arena = "2"
4242

4343
serde = { version = "1.0.0", optional = true }
4444
serde_json = { version = "1.0.0", optional = true }

vm/src/core/mod.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ impl<T> ArenaExt<T> for Arena<T> {
668668
I: IntoIterator<Item = T>,
669669
T: Default,
670670
{
671-
use std::ptr;
671+
use std::{mem::MaybeUninit, ptr};
672672

673673
let iter = iter.into_iter();
674674

@@ -694,7 +694,7 @@ impl<T> ArenaExt<T> for Arena<T> {
694694
let elems = self.alloc_uninitialized(len);
695695

696696
{
697-
let elems = elems as *mut T;
697+
let elems = elems as *mut _ as *mut MaybeUninit<T>;
698698
let mut fill = FillRemainingOnDrop {
699699
ptr: elems as *mut T,
700700
end: elems.add(len) as *mut T,
@@ -707,6 +707,7 @@ impl<T> ArenaExt<T> for Arena<T> {
707707
}
708708
}
709709

710+
let elems = elems as *mut _ as *mut [T];
710711
&mut *elems
711712
}
712713
}
@@ -1061,7 +1062,7 @@ impl<'a, 'e> Translator<'a, 'e> {
10611062
let mut reordered_args = SmallVec::<[_; 16]>::new();
10621063

10631064
let mut overridden_fields = FnvMap::default();
1064-
for (field, arg) in exprs.iter().zip(args.drain()) {
1065+
for (field, arg) in exprs.iter().zip(args.drain(..)) {
10651066
let field_name = field.name.value.declared_name();
10661067
if base_fields.contains(field_name) {
10671068
overridden_fields.insert(field_name, arg);

0 commit comments

Comments
 (0)