fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-07-30 19:41:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into arg-names

Browse Source
This commit is contained in:
Caio
2019-03-14 09:30:14 -03:00
parent 70f5373348 e075d0492d
commit 59c1b2a565
41 changed files with 119 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/anyref-xform/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-anyref-xform"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/anyref-xform"

4
crates/backend/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-backend"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/backend"
@@ -21,4 +21,4 @@ log = "0.4"
proc-macro2 = "0.4.8"
quote = '0.6'
syn = { version = '0.15', features = ['full'] }
wasm-bindgen-shared = { path = "../shared", version = "=0.2.38" }
wasm-bindgen-shared = { path = "../shared", version = "=0.2.39" }

10
crates/cli-support/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-cli-support"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/cli-support"
@@ -18,7 +18,7 @@ log = "0.4"
rustc-demangle = "0.1.13"
tempfile = "3.0"
walrus = "0.5.0"
wasm-bindgen-anyref-xform = { path = '../anyref-xform', version = '=0.2.38' }
wasm-bindgen-shared = { path = "../shared", version = '=0.2.38' }
wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.38' }
wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.38' }
wasm-bindgen-anyref-xform = { path = '../anyref-xform', version = '=0.2.39' }
wasm-bindgen-shared = { path = "../shared", version = '=0.2.39' }
wasm-bindgen-threads-xform = { path = '../threads-xform', version = '=0.2.39' }
wasm-bindgen-wasm-interpreter = { path = "../wasm-interpreter", version = '=0.2.39' }

6
crates/cli/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-cli"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/cli"
@@ -25,8 +25,8 @@ serde = { version = "1.0", features = ['derive'] }
serde_derive = "1.0"
serde_json = "1.0"
walrus = "0.5"
wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.38" }
wasm-bindgen-shared = { path = "../shared", version = "=0.2.38" }
wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.39" }
wasm-bindgen-shared = { path = "../shared", version = "=0.2.39" }
[features]
vendored-openssl = ['openssl/vendored']

8
crates/futures/Cargo.toml
View File

@@ -7,12 +7,12 @@ license = "MIT/Apache-2.0"
name = "wasm-bindgen-futures"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/futures"
readme = "./README.md"
version = "0.3.15"
version = "0.3.16"
[dependencies]
futures = "0.1.20"
js-sys = { path = "../js-sys", version = '0.3.15' }
wasm-bindgen = { path = "../..", version = '0.2.38' }
js-sys = { path = "../js-sys", version = '0.3.16' }
wasm-bindgen = { path = "../..", version = '0.2.39' }
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = { path = '../test', version = '0.2.38' }
wasm-bindgen-test = { path = '../test', version = '0.2.39' }

8
crates/js-sys/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "js-sys"
version = "0.3.15"
version = "0.3.16"
authors = ["The wasm-bindgen Developers"]
readme = "./README.md"
categories = ["wasm"]
@@ -18,9 +18,9 @@ test = false
doctest = false
[dependencies]
wasm-bindgen = { path = "../..", version = "0.2.38" }
wasm-bindgen = { path = "../..", version = "0.2.39" }
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
futures = "0.1.20"
wasm-bindgen-test = { path = '../test', version = '=0.2.38' }
wasm-bindgen-futures = { path = '../futures', version = '=0.3.15' }
wasm-bindgen-test = { path = '../test', version = '=0.2.39' }
wasm-bindgen-futures = { path = '../futures', version = '=0.3.16' }

6
crates/macro-support/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-macro-support"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro-support"
@@ -20,5 +20,5 @@ strict-macro = []
syn = { version = '0.15.0', features = ['visit'] }
quote = '0.6'
proc-macro2 = "0.4.9"
wasm-bindgen-backend = { path = "../backend", version = "=0.2.38" }
wasm-bindgen-shared = { path = "../shared", version = "=0.2.38" }
wasm-bindgen-backend = { path = "../backend", version = "=0.2.39" }
wasm-bindgen-shared = { path = "../shared", version = "=0.2.39" }

4
crates/macro/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-macro"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro"
@@ -19,5 +19,5 @@ xxx_debug_only_print_generated_code = []
strict-macro = ["wasm-bindgen-macro-support/strict-macro"]
[dependencies]
wasm-bindgen-macro-support = { path = "../macro-support", version = "=0.2.38" }
wasm-bindgen-macro-support = { path = "../macro-support", version = "=0.2.39" }
quote = "0.6"

2
crates/shared/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-shared"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/shared"

2
crates/test-macro/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-test-macro"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
description = "Internal testing macro for wasm-bindgen"
license = "MIT/Apache-2.0"

10
crates/test/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-test"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
description = "Internal testing crate for wasm-bindgen"
license = "MIT/Apache-2.0"
@@ -9,11 +9,11 @@ repository = "https://github.com/rustwasm/wasm-bindgen"
[dependencies]
console_error_panic_hook = '0.1'
futures = "0.1"
js-sys = { path = '../js-sys', version = '0.3.15' }
js-sys = { path = '../js-sys', version = '0.3.16' }
scoped-tls = "1.0"
wasm-bindgen = { path = '../..', version = '0.2.38' }
wasm-bindgen-futures = { path = '../futures', version = '0.3.15' }
wasm-bindgen-test-macro = { path = '../test-macro', version = '=0.2.38' }
wasm-bindgen = { path = '../..', version = '0.2.39' }
wasm-bindgen-futures = { path = '../futures', version = '0.3.16' }
wasm-bindgen-test-macro = { path = '../test-macro', version = '=0.2.39' }
[lib]
test = false

2
crates/threads-xform/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-threads-xform"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/threads-xform"

2
crates/wasm-interpreter/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-wasm-interpreter"
version = "0.2.38"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rustwasm/wasm-bindgen/tree/master/crates/wasm-interpreter"

12
crates/web-sys/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "web-sys"
version = "0.3.15"
version = "0.3.16"
authors = ["The wasm-bindgen Developers"]
readme = "./README.md"
homepage = "https://rustwasm.github.io/wasm-bindgen/web-sys/index.html"
@@ -21,17 +21,17 @@ test = false
[build-dependencies]
env_logger = "0.6.0"
failure = "0.1.2"
wasm-bindgen-webidl = { path = "../webidl", version = "=0.2.32" }
wasm-bindgen-webidl = { path = "../webidl", version = "=0.2.39" }
sourcefile = "0.1"
[dependencies]
wasm-bindgen = { path = "../..", version = "0.2.38" }
js-sys = { path = '../js-sys', version = '0.3.15' }
wasm-bindgen = { path = "../..", version = "0.2.39" }
js-sys = { path = '../js-sys', version = '0.3.16' }
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
futures = "0.1"
wasm-bindgen-test = { path = '../test', version = '0.2.38' }
wasm-bindgen-futures = { path = '../futures', version = '0.3.15' }
wasm-bindgen-test = { path = '../test', version = '0.2.39' }
wasm-bindgen-futures = { path = '../futures', version = '0.3.16' }
# This list is generated by passing `__WASM_BINDGEN_DUMP_FEATURES=foo` when
# compiling this crate which dumps the total list of features to a file called

4
crates/webidl/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "wasm-bindgen-webidl"
version = "0.2.32"
version = "0.2.39"
authors = ["The wasm-bindgen Developers"]
license = "MIT/Apache-2.0"
categories = ["wasm"]
@@ -18,5 +18,5 @@ log = "0.4.1"
proc-macro2 = "0.4.8"
quote = '0.6'
syn = { version = '0.15', features = ['full'] }
wasm-bindgen-backend = { version = "=0.2.38", path = "../backend" }
wasm-bindgen-backend = { version = "=0.2.39", path = "../backend" }
weedle = "0.8"

11
crates/webidl/src/lib.rs
View File

@@ -68,10 +68,17 @@ fn parse(webidl_source: &str, allowed_types: Option<&[&str]>) -> Result<Program>
.context(ErrorKind::ParsingWebIDLSource)
.into(),
weedle::Err::Error(cx) | weedle::Err::Failure(cx) => {
// Note that #[allow] here is a workaround for Geal/nom#843
// because the `Context` type here comes from `nom` and if
// something else in our crate graph enables the
// `verbose-errors` feature then we need to still compiled
// against the changed enum definition.
#[allow(unreachable_patterns)]
let remaining = match cx {
weedle::Context::Code(remaining, _) => remaining,
weedle::Context::Code(remaining, _) => remaining.len(),
_ => 0,
};
let pos = webidl_source.len() - remaining.len();
let pos = webidl_source.len() - remaining;
format_err!("failed to parse WebIDL")
.context(ErrorKind::ParsingWebIDLSourcePos(pos))
.into()