Skip to content

Add one more webkit-specific whitelist in web-sys #1865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions crates/cli-support/src/js/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,12 @@ impl<'a> Context<'a> {
};

let default_module_path = match self.config.mode {
OutputMode::Web => "\
OutputMode::Web => {
"\
if (typeof module === 'undefined') {
module = import.meta.url.replace(/\\.js$/, '_bg.wasm');
}",
}"
}
_ => "",
};

Expand Down
2 changes: 1 addition & 1 deletion crates/cli/tests/wasm-bindgen/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ fn empty_interface_types() {
r#"
#[no_mangle]
pub extern fn foo() {}
"#
"#,
)
.file(
"Cargo.toml",
Expand Down
2 changes: 1 addition & 1 deletion crates/futures/src/task/multithread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl Task {
// resources associated with the future ASAP.
Poll::Ready(()) => {
*borrow = None;
},
}

// Unlike `singlethread.rs` we are responsible for ensuring there's
// a closure to handle the notification that a Future is ready. In
Expand Down
2 changes: 1 addition & 1 deletion crates/webidl/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ impl<'src> FirstPassRecord<'src> {

// whitelist a few names that have known polyfills
match name {
"AudioContext" => {
"AudioContext" | "OfflineAudioContext" => {
import_type
.vendor_prefixes
.push(Ident::new("webkit", Span::call_site()));
Expand Down