Skip to content

Commit 16e3de7

Browse files
peterhuenepeterhuene
committed
Update dependencies to latest.
This includes a rename of `float32` to `f32` and `float64` to `f64`.
1 parent 5f90f9d commit 16e3de7

16 files changed

Lines changed: 377 additions & 365 deletions

File tree

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,24 @@ wac-parser = { path = "crates/wac-parser", default-features = false }
4949
wac-resolver = { path = "crates/wac-resolver", default-features = false }
5050
wac-graph = { path = "crates/wac-graph" }
5151
wac-types = { path = "crates/wac-types" }
52-
wit-parser = "0.201.0"
53-
wasmparser = "0.201.0"
54-
wit-component = "0.201.0"
55-
wasm-encoder = "0.201.0"
56-
wasmprinter = "0.201.0"
57-
wasm-metadata = "0.201.0"
52+
wit-parser = "0.202.0"
53+
wasmparser = "0.202.0"
54+
wit-component = "0.202.0"
55+
wasm-encoder = "0.202.0"
56+
wasmprinter = "0.202.0"
57+
wasm-metadata = "0.202.0"
5858
anyhow = "1.0.81"
59-
clap = { version = "4.5.2", features = ["derive"] }
59+
clap = { version = "4.5.4", features = ["derive"] }
6060
semver = { version = "1.0.22", features = ["serde"] }
6161
pretty_env_logger = "0.5.0"
6262
log = "0.4.21"
63-
tokio = { version = "1.36.0", default-features = false, features = ["macros", "rt-multi-thread"] }
63+
tokio = { version = "1.37.0", default-features = false, features = ["macros", "rt-multi-thread"] }
6464
owo-colors = { version = "4.0.0", features = ["supports-colors"] }
65-
indexmap = { version = "2.2.5", features = ["serde"] }
65+
indexmap = { version = "2.2.6", features = ["serde"] }
6666
id-arena = "2.2.1"
6767
serde = { version = "1.0.197", features = ["derive"] }
68-
serde_json = "1.0.114"
69-
wat = "1.201.0"
68+
serde_json = "1.0.115"
69+
wat = "1.202.0"
7070
logos = "0.14.0"
7171
miette = "7.2.0"
7272
thiserror = "1.0.58"

‎LANGUAGE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,8 @@ type ::= u8
498498
| s32
499499
| u64
500500
| s64
501-
| float32
502-
| float64
501+
| f32
502+
| f64
503503
| char
504504
| bool
505505
| string

‎crates/wac-parser/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ wac-resolver = { workspace = true, default-features = false, features = ["wat",
2828
owo-colors = "4.0.0"
2929
pretty_assertions = { workspace = true }
3030
pretty_env_logger = { workspace = true }
31-
rayon = "1.9.0"
31+
rayon = "1.10.0"
3232
tokio = { workspace = true }
3333
serde_json = { workspace = true }
3434
wasmprinter = { workspace = true }

‎crates/wac-parser/src/ast/printer.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ impl<'a, W: Write> DocumentPrinter<'a, W> {
167167
Type::S32(_) => write!(self.writer, "s32"),
168168
Type::U64(_) => write!(self.writer, "u64"),
169169
Type::S64(_) => write!(self.writer, "s64"),
170-
Type::Float32(_) => write!(self.writer, "float32"),
171-
Type::Float64(_) => write!(self.writer, "float64"),
170+
Type::F32(_) => write!(self.writer, "f32"),
171+
Type::F64(_) => write!(self.writer, "f64"),
172172
Type::Char(_) => write!(self.writer, "char"),
173173
Type::Bool(_) => write!(self.writer, "bool"),
174174
Type::String(_) => write!(self.writer, "string"),

‎crates/wac-parser/src/ast/type.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -641,10 +641,10 @@ pub enum Type<'a> {
641641
U64(SourceSpan),
642642
/// A `s64` type.
643643
S64(SourceSpan),
644-
/// A `float32` type.
645-
Float32(SourceSpan),
646-
/// A `float64` type.
647-
Float64(SourceSpan),
644+
/// A `f32` type.
645+
F32(SourceSpan),
646+
/// A `f64` type.
647+
F64(SourceSpan),
648648
/// A `char` type.
649649
Char(SourceSpan),
650650
/// A `bool` type.
@@ -684,8 +684,8 @@ impl<'a> Type<'a> {
684684
| Self::S32(span)
685685
| Self::U64(span)
686686
| Self::S64(span)
687-
| Self::Float32(span)
688-
| Self::Float64(span)
687+
| Self::F32(span)
688+
| Self::F64(span)
689689
| Self::Char(span)
690690
| Self::Bool(span)
691691
| Self::String(span)
@@ -718,10 +718,10 @@ impl<'a> Parse<'a> for Type<'a> {
718718
Ok(Self::U64(lexer.next().unwrap().1))
719719
} else if lookahead.peek(Token::S64Keyword) {
720720
Ok(Self::S64(lexer.next().unwrap().1))
721-
} else if lookahead.peek(Token::Float32Keyword) {
722-
Ok(Self::Float32(lexer.next().unwrap().1))
723-
} else if lookahead.peek(Token::Float64Keyword) {
724-
Ok(Self::Float64(lexer.next().unwrap().1))
721+
} else if lookahead.peek(Token::F32Keyword) {
722+
Ok(Self::F32(lexer.next().unwrap().1))
723+
} else if lookahead.peek(Token::F64Keyword) {
724+
Ok(Self::F64(lexer.next().unwrap().1))
725725
} else if lookahead.peek(Token::CharKeyword) {
726726
Ok(Self::Char(lexer.next().unwrap().1))
727727
} else if lookahead.peek(Token::BoolKeyword) {
@@ -842,8 +842,8 @@ impl Peek for Type<'_> {
842842
|| lookahead.peek(Token::S32Keyword)
843843
|| lookahead.peek(Token::U64Keyword)
844844
|| lookahead.peek(Token::S64Keyword)
845-
|| lookahead.peek(Token::Float32Keyword)
846-
|| lookahead.peek(Token::Float64Keyword)
845+
|| lookahead.peek(Token::F32Keyword)
846+
|| lookahead.peek(Token::F64Keyword)
847847
|| lookahead.peek(Token::CharKeyword)
848848
|| lookahead.peek(Token::BoolKeyword)
849849
|| lookahead.peek(Token::StringKeyword)
@@ -1562,8 +1562,8 @@ enum foo {
15621562
#[test]
15631563
fn type_alias_roundtrip() {
15641564
roundtrip(
1565-
r#"package foo:bar; type x = tuple<u8, s8, u16, s16, u32, s32, u64, s64, float32, float64, char, bool, string, tuple<string, list<u8>>, option<list<bool>>, result, result<string>, result<_, string>, result<u8, u8>, borrow<y>, y>;"#,
1566-
"package foo:bar;\n\ntype x = tuple<u8, s8, u16, s16, u32, s32, u64, s64, float32, float64, char, bool, string, tuple<string, list<u8>>, option<list<bool>>, result, result<string>, result<_, string>, result<u8, u8>, borrow<y>, y>;\n",
1565+
r#"package foo:bar; type x = tuple<u8, s8, u16, s16, u32, s32, u64, s64, f32, f64, char, bool, string, tuple<string, list<u8>>, option<list<bool>>, result, result<string>, result<_, string>, result<u8, u8>, borrow<y>, y>;"#,
1566+
"package foo:bar;\n\ntype x = tuple<u8, s8, u16, s16, u32, s32, u64, s64, f32, f64, char, bool, string, tuple<string, list<u8>>, option<list<bool>>, result, result<string>, result<_, string>, result<u8, u8>, borrow<y>, y>;\n",
15671567
)
15681568
.unwrap();
15691569
}

‎crates/wac-parser/src/lexer.rs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,12 @@ pub enum Token {
193193
/// The `s64` keyword.
194194
#[token("s64")]
195195
S64Keyword,
196-
/// The `float32` keyword.
197-
#[token("float32")]
198-
Float32Keyword,
199-
/// The `float64` keyword.
200-
#[token("float64")]
201-
Float64Keyword,
196+
/// The `f32` keyword.
197+
#[token("f32")]
198+
F32Keyword,
199+
/// The `f64` keyword.
200+
#[token("f64")]
201+
F64Keyword,
202202
/// The `char` keyword.
203203
#[token("char")]
204204
CharKeyword,
@@ -327,8 +327,8 @@ impl fmt::Display for Token {
327327
Token::S32Keyword => write!(f, "`s32` keyword"),
328328
Token::U64Keyword => write!(f, "`u64` keyword"),
329329
Token::S64Keyword => write!(f, "`s64` keyword"),
330-
Token::Float32Keyword => write!(f, "`float32` keyword"),
331-
Token::Float64Keyword => write!(f, "`float64` keyword"),
330+
Token::F32Keyword => write!(f, "`f32` keyword"),
331+
Token::F64Keyword => write!(f, "`f64` keyword"),
332332
Token::CharKeyword => write!(f, "`char` keyword"),
333333
Token::BoolKeyword => write!(f, "`bool` keyword"),
334334
Token::StringKeyword => write!(f, "`string` keyword"),
@@ -818,8 +818,8 @@ u32
818818
s32
819819
u64
820820
s64
821-
float32
822-
float64
821+
f32
822+
f64
823823
char
824824
bool
825825
string
@@ -859,21 +859,21 @@ targets
859859
(Ok(Token::S32Keyword), "s32", 127..130),
860860
(Ok(Token::U64Keyword), "u64", 131..134),
861861
(Ok(Token::S64Keyword), "s64", 135..138),
862-
(Ok(Token::Float32Keyword), "float32", 139..146),
863-
(Ok(Token::Float64Keyword), "float64", 147..154),
864-
(Ok(Token::CharKeyword), "char", 155..159),
865-
(Ok(Token::BoolKeyword), "bool", 160..164),
866-
(Ok(Token::StringKeyword), "string", 165..171),
867-
(Ok(Token::InterfaceKeyword), "interface", 172..181),
868-
(Ok(Token::WorldKeyword), "world", 182..187),
869-
(Ok(Token::ExportKeyword), "export", 188..194),
870-
(Ok(Token::NewKeyword), "new", 195..198),
871-
(Ok(Token::LetKeyword), "let", 199..202),
872-
(Ok(Token::UseKeyword), "use", 203..206),
873-
(Ok(Token::IncludeKeyword), "include", 207..214),
874-
(Ok(Token::AsKeyword), "as", 215..217),
875-
(Ok(Token::PackageKeyword), "package", 218..225),
876-
(Ok(Token::TargetsKeyword), "targets", 226..233),
862+
(Ok(Token::F32Keyword), "f32", 139..142),
863+
(Ok(Token::F64Keyword), "f64", 143..146),
864+
(Ok(Token::CharKeyword), "char", 147..151),
865+
(Ok(Token::BoolKeyword), "bool", 152..156),
866+
(Ok(Token::StringKeyword), "string", 157..163),
867+
(Ok(Token::InterfaceKeyword), "interface", 164..173),
868+
(Ok(Token::WorldKeyword), "world", 174..179),
869+
(Ok(Token::ExportKeyword), "export", 180..186),
870+
(Ok(Token::NewKeyword), "new", 187..190),
871+
(Ok(Token::LetKeyword), "let", 191..194),
872+
(Ok(Token::UseKeyword), "use", 195..198),
873+
(Ok(Token::IncludeKeyword), "include", 199..206),
874+
(Ok(Token::AsKeyword), "as", 207..209),
875+
(Ok(Token::PackageKeyword), "package", 210..217),
876+
(Ok(Token::TargetsKeyword), "targets", 218..225),
877877
],
878878
);
879879
}

‎crates/wac-parser/src/resolution/ast.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,8 +1381,8 @@ impl<'a> AstResolver<'a> {
13811381
ast::Type::S32(_) => Ok(ValueType::Primitive(PrimitiveType::S32)),
13821382
ast::Type::U64(_) => Ok(ValueType::Primitive(PrimitiveType::U64)),
13831383
ast::Type::S64(_) => Ok(ValueType::Primitive(PrimitiveType::S64)),
1384-
ast::Type::Float32(_) => Ok(ValueType::Primitive(PrimitiveType::Float32)),
1385-
ast::Type::Float64(_) => Ok(ValueType::Primitive(PrimitiveType::Float64)),
1384+
ast::Type::F32(_) => Ok(ValueType::Primitive(PrimitiveType::F32)),
1385+
ast::Type::F64(_) => Ok(ValueType::Primitive(PrimitiveType::F64)),
13861386
ast::Type::Char(_) => Ok(ValueType::Primitive(PrimitiveType::Char)),
13871387
ast::Type::Bool(_) => Ok(ValueType::Primitive(PrimitiveType::Bool)),
13881388
ast::Type::String(_) => Ok(ValueType::Primitive(PrimitiveType::String)),

‎crates/wac-parser/src/resolution/encoding.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ impl From<PrimitiveType> for PrimitiveValType {
377377
PrimitiveType::S32 => Self::S32,
378378
PrimitiveType::U64 => Self::U64,
379379
PrimitiveType::S64 => Self::S64,
380-
PrimitiveType::Float32 => Self::Float32,
381-
PrimitiveType::Float64 => Self::Float64,
380+
PrimitiveType::F32 => Self::F32,
381+
PrimitiveType::F64 => Self::F64,
382382
PrimitiveType::Char => Self::Char,
383383
PrimitiveType::Bool => Self::Bool,
384384
PrimitiveType::String => Self::String,

‎crates/wac-parser/src/resolution/types.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ pub enum PrimitiveType {
131131
U64,
132132
/// A `s64` type.
133133
S64,
134-
/// A `float32` type.
135-
Float32,
136-
/// A `float64` type.
137-
Float64,
134+
/// A `f32` type.
135+
F32,
136+
/// A `f64` type.
137+
F64,
138138
/// A `char` type.
139139
Char,
140140
/// A `bool` type.
@@ -154,8 +154,8 @@ impl PrimitiveType {
154154
Self::S32 => "s32",
155155
Self::U64 => "u64",
156156
Self::S64 => "s64",
157-
Self::Float32 => "float32",
158-
Self::Float64 => "float64",
157+
Self::F32 => "f32",
158+
Self::F64 => "f64",
159159
Self::Char => "char",
160160
Self::Bool => "bool",
161161
Self::String => "string",
@@ -175,8 +175,8 @@ impl From<wasmparser::PrimitiveValType> for PrimitiveType {
175175
wasmparser::PrimitiveValType::U32 => Self::U32,
176176
wasmparser::PrimitiveValType::S64 => Self::S64,
177177
wasmparser::PrimitiveValType::U64 => Self::U64,
178-
wasmparser::PrimitiveValType::Float32 => Self::Float32,
179-
wasmparser::PrimitiveValType::Float64 => Self::Float64,
178+
wasmparser::PrimitiveValType::F32 => Self::F32,
179+
wasmparser::PrimitiveValType::F64 => Self::F64,
180180
wasmparser::PrimitiveValType::Char => Self::Char,
181181
wasmparser::PrimitiveValType::String => Self::String,
182182
}

0 commit comments

Comments
 (0)