Skip to content

Commit 52ba3ec

Browse files
jrmuizelarai-a
authored andcommitted
Update to weedle 0.11
This changes the dependency from nom4 to nom5 which is helpful for avoiding duplication in mozilla-central
1 parent 9794a8c commit 52ba3ec

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

crates/binjs_meta/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ travis-ci = { repository = "https://github.com/binast/binjs-ref", branch = "mast
1717
Inflector = "^0.11.4"
1818
itertools = "^0.8"
1919
log = "^0.4"
20-
weedle = "^0.8"
20+
weedle = "0.11"
2121

2222
[dev-dependencies]
2323
clap = "^2.0"

crates/binjs_meta/src/import.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl Importer {
7575
/// ```
7676
pub fn import<'a>(
7777
sources: impl IntoIterator<Item = &'a str>,
78-
) -> Result<SpecBuilder, weedle::Err<CompleteStr<'a>>> {
78+
) -> Result<SpecBuilder, weedle::Err<(&'a str, ErrorKind)>> {
7979
let mut importer = Importer {
8080
path: Vec::with_capacity(256),
8181
builder: SpecBuilder::new(),
@@ -330,7 +330,9 @@ impl Importer {
330330
.list
331331
.iter()
332332
.map(|t| match t {
333-
UnionMemberType::Single(t) => self.convert_single_type(t),
333+
UnionMemberType::Single(AttributedNonAnyType { type_: t, .. }) => {
334+
self.convert_single_type(t)
335+
}
334336
UnionMemberType::Union(t) => self.convert_union_type(t),
335337
})
336338
.map(|t| t.spec)

0 commit comments

Comments
 (0)