Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Use #[automatically_derived] instead of #[coverage(off)] #4078

Merged
merged 1 commit into from
Aug 18, 2024
Merged

Use #[automatically_derived] instead of #[coverage(off)] #4078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
* Fixed incorrect deprecation warning when passing no parameter into `default()` (`init()`) or `initSync()`.
[#4074](https://github.com/rustwasm/wasm-bindgen/pull/4074)

* Fixed many proc-macro generated `impl` blocks missing `#[automatically_derived]`, affecting test coverage.
[#4078](https://github.com/rustwasm/wasm-bindgen/pull/4078)

--------------------------------------------------------------------------------

## [0.2.93](https://github.com/rustwasm/wasm-bindgen/compare/0.2.92...0.2.93)
Expand Down
30 changes: 24 additions & 6 deletions crates/backend/src/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ impl ToTokens for ast::Struct {
(quote! {
#[automatically_derived]
impl #wasm_bindgen::describe::WasmDescribe for #name {
#[cfg_attr(wasm_bindgen_unstable_test_coverage, coverage(off))]
fn describe() {
use #wasm_bindgen::__wbindgen_if_not_std;
use #wasm_bindgen::describe::*;
Expand Down Expand Up @@ -369,7 +368,7 @@ impl ToTokens for ast::Struct {
fn is_none(abi: &Self::Abi) -> bool { *abi == 0 }
}

#[allow(clippy::all)]
#[automatically_derived]
impl #wasm_bindgen::convert::TryFromJsValue for #name {
type Error = #wasm_bindgen::JsValue;

Expand Down Expand Up @@ -404,8 +403,8 @@ impl ToTokens for ast::Struct {
}
}

#[automatically_derived]
impl #wasm_bindgen::describe::WasmDescribeVector for #name {
#[cfg_attr(wasm_bindgen_unstable_test_coverage, coverage(off))]
fn describe_vector() {
use #wasm_bindgen::describe::*;
inform(VECTOR);
Expand All @@ -415,6 +414,7 @@ impl ToTokens for ast::Struct {
}
}

#[automatically_derived]
impl #wasm_bindgen::convert::VectorIntoWasmAbi for #name {
type Abi = <
#wasm_bindgen::__rt::alloc::boxed::Box<[#wasm_bindgen::JsValue]>
Expand All @@ -428,6 +428,7 @@ impl ToTokens for ast::Struct {
}
}

#[automatically_derived]
impl #wasm_bindgen::convert::VectorFromWasmAbi for #name {
type Abi = <
#wasm_bindgen::__rt::alloc::boxed::Box<[#wasm_bindgen::JsValue]>
Expand All @@ -441,6 +442,7 @@ impl ToTokens for ast::Struct {
}
}

#[automatically_derived]
impl #wasm_bindgen::__rt::VectorIntoJsValue for #name {
fn vector_into_jsvalue(vector: #wasm_bindgen::__rt::alloc::boxed::Box<[#name]>) -> #wasm_bindgen::JsValue {
#wasm_bindgen::__rt::js_value_vector_into_jsvalue(vector)
Expand Down Expand Up @@ -939,13 +941,14 @@ impl ToTokens for ast::ImportType {
use #wasm_bindgen::{JsValue, JsCast, JsObject};
use #wasm_bindgen::__rt::core;

#[automatically_derived]
impl WasmDescribe for #rust_name {
#[cfg_attr(wasm_bindgen_unstable_test_coverage, coverage(off))]
fn describe() {
#description
}
}

#[automatically_derived]
impl IntoWasmAbi for #rust_name {
type Abi = <JsValue as IntoWasmAbi>::Abi;

Expand All @@ -955,20 +958,23 @@ impl ToTokens for ast::ImportType {
}
}

#[automatically_derived]
impl OptionIntoWasmAbi for #rust_name {
#[inline]
fn none() -> Self::Abi {
0
}
}

#[automatically_derived]
impl<'a> OptionIntoWasmAbi for &'a #rust_name {
#[inline]
fn none() -> Self::Abi {
0
}
}

#[automatically_derived]
impl FromWasmAbi for #rust_name {
type Abi = <JsValue as FromWasmAbi>::Abi;

Expand All @@ -980,11 +986,13 @@ impl ToTokens for ast::ImportType {
}
}

#[automatically_derived]
impl OptionFromWasmAbi for #rust_name {
#[inline]
fn is_none(abi: &Self::Abi) -> bool { *abi == 0 }
}

#[automatically_derived]
impl<'a> IntoWasmAbi for &'a #rust_name {
type Abi = <&'a JsValue as IntoWasmAbi>::Abi;

Expand All @@ -994,6 +1002,7 @@ impl ToTokens for ast::ImportType {
}
}

#[automatically_derived]
impl RefFromWasmAbi for #rust_name {
type Abi = <JsValue as RefFromWasmAbi>::Abi;
type Anchor = core::mem::ManuallyDrop<#rust_name>;
Expand All @@ -1007,6 +1016,7 @@ impl ToTokens for ast::ImportType {
}
}

#[automatically_derived]
impl LongRefFromWasmAbi for #rust_name {
type Abi = <JsValue as LongRefFromWasmAbi>::Abi;
type Anchor = #rust_name;
Expand All @@ -1019,31 +1029,36 @@ impl ToTokens for ast::ImportType {
}

// TODO: remove this on the next major version
#[automatically_derived]
impl From<JsValue> for #rust_name {
#[inline]
fn from(obj: JsValue) -> #rust_name {
#rust_name { obj: obj.into() }
}
}

#[automatically_derived]
impl AsRef<JsValue> for #rust_name {
#[inline]
fn as_ref(&self) -> &JsValue { self.obj.as_ref() }
}

#[automatically_derived]
impl AsRef<#rust_name> for #rust_name {
#[inline]
fn as_ref(&self) -> &#rust_name { self }
}


#[automatically_derived]
impl From<#rust_name> for JsValue {
#[inline]
fn from(obj: #rust_name) -> JsValue {
obj.obj.into()
}
}

#[automatically_derived]
impl JsCast for #rust_name {
fn instanceof(val: &JsValue) -> bool {
#[link(wasm_import_module = "__wbindgen_placeholder__")]
Expand Down Expand Up @@ -1592,7 +1607,7 @@ impl ToTokens for ast::Enum {
}
}

#[allow(clippy::all)]
#[automatically_derived]
impl #wasm_bindgen::convert::TryFromJsValue for #enum_name {
type Error = #wasm_bindgen::JsValue;

Expand All @@ -1609,15 +1624,16 @@ impl ToTokens for ast::Enum {
}
}

#[automatically_derived]
impl #wasm_bindgen::describe::WasmDescribeVector for #enum_name {
#[cfg_attr(wasm_bindgen_unstable_test_coverage, coverage(off))]
fn describe_vector() {
use #wasm_bindgen::describe::*;
inform(VECTOR);
<#wasm_bindgen::JsValue as #wasm_bindgen::describe::WasmDescribe>::describe();
}
}

#[automatically_derived]
impl #wasm_bindgen::convert::VectorIntoWasmAbi for #enum_name {
type Abi = <
#wasm_bindgen::__rt::alloc::boxed::Box<[#wasm_bindgen::JsValue]>
Expand All @@ -1631,6 +1647,7 @@ impl ToTokens for ast::Enum {
}
}

#[automatically_derived]
impl #wasm_bindgen::convert::VectorFromWasmAbi for #enum_name {
type Abi = <
#wasm_bindgen::__rt::alloc::boxed::Box<[#wasm_bindgen::JsValue]>
Expand All @@ -1644,6 +1661,7 @@ impl ToTokens for ast::Enum {
}
}

#[automatically_derived]
impl #wasm_bindgen::__rt::VectorIntoJsValue for #enum_name {
fn vector_into_jsvalue(vector: #wasm_bindgen::__rt::alloc::boxed::Box<[#enum_name]>) -> #wasm_bindgen::JsValue {
#wasm_bindgen::__rt::js_value_vector_into_jsvalue(vector)
Expand Down
48 changes: 24 additions & 24 deletions crates/cli/tests/reference/raw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,6 @@ export function __wbg_set_wasm(val) {
}


const heap = new Array(128).fill(undefined);

heap.push(undefined, null, true, false);

function getObject(idx) { return heap[idx]; }

let heap_next = heap.length;

function dropObject(idx) {
if (idx < 132) return;
heap[idx] = heap_next;
heap_next = idx;
}

function takeObject(idx) {
const ret = getObject(idx);
dropObject(idx);
return ret;
}

const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;

let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
Expand All @@ -45,6 +25,26 @@ function getStringFromWasm0(ptr, len) {
ptr = ptr >>> 0;
return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
}

const heap = new Array(128).fill(undefined);

heap.push(undefined, null, true, false);

function getObject(idx) { return heap[idx]; }

let heap_next = heap.length;

function dropObject(idx) {
if (idx < 132) return;
heap[idx] = heap_next;
heap_next = idx;
}

function takeObject(idx) {
const ret = getObject(idx);
dropObject(idx);
return ret;
}
/**
* @param {number} test
* @returns {number}
Expand Down Expand Up @@ -110,11 +110,11 @@ export function __wbg_test2_39fe629b9aa739cf() {
return addHeapObject(ret);
};

export function __wbindgen_object_drop_ref(arg0) {
takeObject(arg0);
};

export function __wbindgen_throw(arg0, arg1) {
throw new Error(getStringFromWasm0(arg0, arg1));
};

export function __wbindgen_object_drop_ref(arg0) {
takeObject(arg0);
};