fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-03-28 07:51:07 +00:00
Code Issues Projects Releases Wiki Activity

backend: Rename ast::ImportType::name to ast::ImportType::rust_name

Browse Source 
This helps pave the way for adding a js_name, and makes it more clear which name
this is.
This commit is contained in:
Nick Fitzgerald 2018-08-07 16:09:38 -07:00
parent 5b935526ff
commit 9104bf87e9
4 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/backend/src/ast.rs
View File

@ -124,7 +124,7 @@ pub struct ImportStatic {
#[cfg_attr(feature = "extra-traits", derive(Debug, PartialEq, Eq))] #[cfg_attr(feature = "extra-traits", derive(Debug, PartialEq, Eq))]
pub struct ImportType { pub struct ImportType {
pub vis: syn::Visibility, pub vis: syn::Visibility,
pub name: Ident, pub rust_name: Ident,
pub attrs: Vec<syn::Attribute>, pub attrs: Vec<syn::Attribute>,
pub doc_comment: Option<String>, pub doc_comment: Option<String>,
pub instanceof_shim: String, pub instanceof_shim: String,
@ -411,7 +411,7 @@ impl ImportStatic {
impl ImportType { impl ImportType {
fn shared(&self) -> shared::ImportType { fn shared(&self) -> shared::ImportType {
shared::ImportType { shared::ImportType {
name: self.name.to_string(), name: self.rust_name.to_string(),
instanceof_shim: self.instanceof_shim.clone(), instanceof_shim: self.instanceof_shim.clone(),
} }
} }

64
crates/backend/src/codegen.rs
View File

@ -37,7 +37,7 @@ impl TryToTokens for ast::Program {
let mut types = HashSet::new(); let mut types = HashSet::new();
for i in self.imports.iter() { for i in self.imports.iter() {
if let ast::ImportKind::Type(t) = &i.kind { if let ast::ImportKind::Type(t) = &i.kind {
types.insert(t.name.clone()); types.insert(t.rust_name.clone());
} }
} }
for i in self.imports.iter() { for i in self.imports.iter() {
@ -513,13 +513,13 @@ impl TryToTokens for ast::ImportKind {
impl ToTokens for ast::ImportType { impl ToTokens for ast::ImportType {
fn to_tokens(&self, tokens: &mut TokenStream) { fn to_tokens(&self, tokens: &mut TokenStream) {
let vis = &self.vis; let vis = &self.vis;
let name = &self.name; let rust_name = &self.rust_name;
let attrs = &self.attrs; let attrs = &self.attrs;
let doc_comment = match &self.doc_comment { let doc_comment = match &self.doc_comment {
None => "", None => "",
Some(comment) => comment, Some(comment) => comment,
}; };
let const_name = format!("__wbg_generated_const_{}", name); let const_name = format!("__wbg_generated_const_{}", rust_name);
let const_name = Ident::new(&const_name, Span::call_site()); let const_name = Ident::new(&const_name, Span::call_site());
let instanceof_shim = Ident::new(&self.instanceof_shim, Span::call_site()); let instanceof_shim = Ident::new(&self.instanceof_shim, Span::call_site());
(quote! { (quote! {
@ -527,7 +527,7 @@ impl ToTokens for ast::ImportType {
#(#attrs)* #(#attrs)*
#[doc = #doc_comment] #[doc = #doc_comment]
#[repr(transparent)] #[repr(transparent)]
#vis struct #name { #vis struct #rust_name {
obj: ::wasm_bindgen::JsValue, obj: ::wasm_bindgen::JsValue,
} }
@ -540,13 +540,13 @@ impl ToTokens for ast::ImportType {
use wasm_bindgen::{JsValue, JsCast}; use wasm_bindgen::{JsValue, JsCast};
use wasm_bindgen::__rt::core::mem::ManuallyDrop; use wasm_bindgen::__rt::core::mem::ManuallyDrop;
impl WasmDescribe for #name { impl WasmDescribe for #rust_name {
fn describe() { fn describe() {
JsValue::describe(); JsValue::describe();
} }
} }
impl IntoWasmAbi for #name { impl IntoWasmAbi for #rust_name {
type Abi = <JsValue as IntoWasmAbi>::Abi; type Abi = <JsValue as IntoWasmAbi>::Abi;
fn into_abi(self, extra: &mut Stack) -> Self::Abi { fn into_abi(self, extra: &mut Stack) -> Self::Abi {
@ -554,29 +554,29 @@ impl ToTokens for ast::ImportType {
} }
} }
impl OptionIntoWasmAbi for #name { impl OptionIntoWasmAbi for #rust_name {
fn none() -> Self::Abi { 0 } fn none() -> Self::Abi { 0 }
} }
impl<'a> OptionIntoWasmAbi for &'a #name { impl<'a> OptionIntoWasmAbi for &'a #rust_name {
fn none() -> Self::Abi { 0 } fn none() -> Self::Abi { 0 }
} }
impl FromWasmAbi for #name { impl FromWasmAbi for #rust_name {
type Abi = <JsValue as FromWasmAbi>::Abi; type Abi = <JsValue as FromWasmAbi>::Abi;
unsafe fn from_abi(js: Self::Abi, extra: &mut Stack) -> Self { unsafe fn from_abi(js: Self::Abi, extra: &mut Stack) -> Self {
#name { #rust_name {
obj: JsValue::from_abi(js, extra), obj: JsValue::from_abi(js, extra),
} }
} }
} }
impl OptionFromWasmAbi for #name { impl OptionFromWasmAbi for #rust_name {
fn is_none(abi: &Self::Abi) -> bool { *abi == 0 } fn is_none(abi: &Self::Abi) -> bool { *abi == 0 }
} }
impl<'a> IntoWasmAbi for &'a #name { impl<'a> IntoWasmAbi for &'a #rust_name {
type Abi = <&'a JsValue as IntoWasmAbi>::Abi; type Abi = <&'a JsValue as IntoWasmAbi>::Abi;
fn into_abi(self, extra: &mut Stack) -> Self::Abi { fn into_abi(self, extra: &mut Stack) -> Self::Abi {
@ -584,40 +584,40 @@ impl ToTokens for ast::ImportType {
} }
} }
impl RefFromWasmAbi for #name { impl RefFromWasmAbi for #rust_name {
type Abi = <JsValue as RefFromWasmAbi>::Abi; type Abi = <JsValue as RefFromWasmAbi>::Abi;
type Anchor = ManuallyDrop<#name>; type Anchor = ManuallyDrop<#rust_name>;
unsafe fn ref_from_abi(js: Self::Abi, extra: &mut Stack) -> Self::Anchor { unsafe fn ref_from_abi(js: Self::Abi, extra: &mut Stack) -> Self::Anchor {
let tmp = <JsValue as RefFromWasmAbi>::ref_from_abi(js, extra); let tmp = <JsValue as RefFromWasmAbi>::ref_from_abi(js, extra);
ManuallyDrop::new(#name { ManuallyDrop::new(#rust_name {
obj: ManuallyDrop::into_inner(tmp), obj: ManuallyDrop::into_inner(tmp),
}) })
} }
} }
// TODO: remove this on the next major version // TODO: remove this on the next major version
impl From<JsValue> for #name { impl From<JsValue> for #rust_name {
fn from(obj: JsValue) -> #name { fn from(obj: JsValue) -> #rust_name {
#name { obj } #rust_name { obj }
} }
} }
impl AsRef<JsValue> for #name { impl AsRef<JsValue> for #rust_name {
fn as_ref(&self) -> &JsValue { &self.obj } fn as_ref(&self) -> &JsValue { &self.obj }
} }
impl AsMut<JsValue> for #name { impl AsMut<JsValue> for #rust_name {
fn as_mut(&mut self) -> &mut JsValue { &mut self.obj } fn as_mut(&mut self) -> &mut JsValue { &mut self.obj }
} }
impl From<#name> for JsValue { impl From<#rust_name> for JsValue {
fn from(obj: #name) -> JsValue { fn from(obj: #rust_name) -> JsValue {
obj.obj obj.obj
} }
} }
impl JsCast for #name { impl JsCast for #rust_name {
#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))] #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
fn instanceof(val: &JsValue) -> bool { fn instanceof(val: &JsValue) -> bool {
#[link(wasm_import_module = "__wbindgen_placeholder__")] #[link(wasm_import_module = "__wbindgen_placeholder__")]
@ -637,19 +637,19 @@ impl ToTokens for ast::ImportType {
} }
fn unchecked_from_js(val: JsValue) -> Self { fn unchecked_from_js(val: JsValue) -> Self {
#name { obj: val } #rust_name { obj: val }
} }
fn unchecked_from_js_ref(val: &JsValue) -> &Self { fn unchecked_from_js_ref(val: &JsValue) -> &Self {
// Should be safe because `#name` is a transparent // Should be safe because `#rust_name` is a transparent
// wrapper around `val` // wrapper around `val`
unsafe { &*(val as *const JsValue as *const #name) } unsafe { &*(val as *const JsValue as *const #rust_name) }
} }
fn unchecked_from_js_mut(val: &mut JsValue) -> &mut Self { fn unchecked_from_js_mut(val: &mut JsValue) -> &mut Self {
// Should be safe because `#name` is a transparent // Should be safe because `#rust_name` is a transparent
// wrapper around `val` // wrapper around `val`
unsafe { &mut *(val as *mut JsValue as *mut #name) } unsafe { &mut *(val as *mut JsValue as *mut #rust_name) }
} }
} }
@ -659,21 +659,21 @@ impl ToTokens for ast::ImportType {
for superclass in self.extends.iter() { for superclass in self.extends.iter() {
(quote! { (quote! {
impl From<#name> for #superclass { impl From<#rust_name> for #superclass {
fn from(obj: #name) -> #superclass { fn from(obj: #rust_name) -> #superclass {
use wasm_bindgen::JsCast; use wasm_bindgen::JsCast;
#superclass::unchecked_from_js(obj.into()) #superclass::unchecked_from_js(obj.into())
} }
} }
impl AsRef<#superclass> for #name { impl AsRef<#superclass> for #rust_name {
fn as_ref(&self) -> &#superclass { fn as_ref(&self) -> &#superclass {
use wasm_bindgen::JsCast; use wasm_bindgen::JsCast;
#superclass::unchecked_from_js_ref(self.as_ref()) #superclass::unchecked_from_js_ref(self.as_ref())
} }
} }
impl AsMut<#superclass> for #name { impl AsMut<#superclass> for #rust_name {
fn as_mut(&mut self) -> &mut #superclass { fn as_mut(&mut self) -> &mut #superclass {
use wasm_bindgen::JsCast; use wasm_bindgen::JsCast;
#superclass::unchecked_from_js_mut(self.as_mut()) #superclass::unchecked_from_js_mut(self.as_mut())

4
crates/backend/src/defined.rs
View File

@ -205,7 +205,7 @@ impl ImportedTypes for syn::PathArguments {
for input in data.inputs.iter() { for input in data.inputs.iter() {
input.imported_types(f); input.imported_types(f);
} }
// TODO do we need to handle output here? // TODO do we need to handle output here?
// https://docs.rs/syn/0.14.0/syn/struct.ParenthesizedGenericArguments.html // https://docs.rs/syn/0.14.0/syn/struct.ParenthesizedGenericArguments.html
} }
syn::PathArguments::None => {} syn::PathArguments::None => {}
@ -276,7 +276,7 @@ impl ImportedTypes for ast::ImportType {
where where
F: FnMut(&Ident, ImportedTypeKind), F: FnMut(&Ident, ImportedTypeKind),
{ {
f(&self.name, ImportedTypeKind::Definition); f(&self.rust_name, ImportedTypeKind::Definition);
} }
} }

2
crates/macro-support/src/parser.rs
View File

@ -548,7 +548,7 @@ impl ConvertToAst<BindgenAttrs> for syn::ForeignItemType {
attrs: self.attrs, attrs: self.attrs,
doc_comment: None, doc_comment: None,
instanceof_shim: shim, instanceof_shim: shim,
name: self.ident, rust_name: self.ident,
extends: attrs.extends().cloned().collect(), extends: attrs.extends().cloned().collect(),
})) }))
} }