fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-21 08:41:35 +00:00
Code Issues Projects Releases Wiki Activity

cargo +nightly fmt --all

Browse Source 
Rustfmt all the things!
This commit is contained in:
Alex Crichton
2018-09-26 08:26:00 -07:00
parent a3e160744e
commit 7ecf4aae87
163 changed files with 2975 additions and 1998 deletions
crates
backend
src
ast.rscodegen.rsdefined.rserror.rslib.rsutil.rs
cli-support
src
descriptor.rs
js
closures.rsjs2rust.rsmod.rsrust2js.rs
lib.rs
cli
src
bin
wasm-bindgen-test-runner
headless.rsmain.rsnode.rsserver.rsshell.rs
wasm2es6js.rs
futures
src
lib.rs
js-sys
tests
headless.rs
wasm
Array.rsArrayBuffer.rsArrayIterator.rsBoolean.rsDate.rsError.rsEvalError.rsFunction.rsGenerator.rsIntl.rsIterator.rsJSON.rsJsString.rsMap.rsMapIterator.rsMath.rsNumber.rsPromise.rsProxy.rsRangeError.rsReferenceError.rsReflect.rsRegExp.rsSet.rsSetIterator.rsSymbol.rsSyntaxError.rsTypeError.rsTypedArray.rsUriError.rsWeakMap.rsWeakSet.rsWebAssembly.rsglobal_fns.rsmain.rs
macro-support
src
lib.rsparser.rs
test-macro
src
lib.rs
test
sample
src
lib.rs
tests
common
mod.rs
src
rt
browser.rsdetect.rsmod.rsnode.rs
typescript
src
parser.rs
wasm-interpreter
src
lib.rs
tests
smoke.rs
web-sys
build.rs
src
lib.rs
tests
wasm
anchor_element.rsbody_element.rsbr_element.rsbutton_element.rsdiv_element.rselement.rsevent.rshead_element.rsheaders.rsheading_element.rshistory.rshr_element.rshtml_element.rshtml_html_element.rsinput_element.rsmain.rsmeta_element.rsmeter_element.rsmod_elements.rsolist_element.rsoptgroup_element.rsoption_element.rsoptions_collection.rsoutput_element.rsparagraph_element.rsparam_element.rsperformance.rspre_element.rsprogress_element.rsquote_element.rsresponse.rsscript_element.rsselect_element.rsslot_element.rsspan_element.rsstyle_element.rstable_element.rstitle_element.rsxpath_result.rs
webidl-tests
build.rscallbacks.rsdictionary.rsglobal.rsmain.rssimple.rs
webidl
src
error.rsfirst_pass.rsidl_type.rslib.rsutil.rs
examples
canvas
src
lib.rs
closures
src
lib.rs
duck-typed-interfaces
src
lib.rs
fetch
src
lib.rs
guide-supported-types-examples
src
imported_types.rslib.rs
julia_set
src
lib.rs
performance
src
lib.rs
src
convert
closures.rsimpls.rsmod.rsslices.rs
describe.rslib.rs
tests
crates
a
src
lib.rs
b
src
lib.rs
headless.rs
no-std
test.rs
non_wasm.rsstd-crate-no-std-dep.rs
wasm
api.rschar.rsclasses.rsclosures.rscomments.rsduplicate_deps.rsduplicates.rsenums.rsimport_class.rsimports.rsjs_objects.rsjscast.rsmain.rsmath.rsnode.rsoption.rsoptional_primitives.rsrethrow.rssimple.rsslice.rsstructural.rsu64.rsvalidate_prt.rsvariadic.rs

74
crates/cli-support/src/js/js2rust.rs

@ -197,10 +197,8 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
self.cx.expose_add_heap_object();
if optional {
self.cx.expose_is_like_none();
self.rust_arguments.push(format!(
"isLikeNone({0}) ? 0 : addHeapObject({0})",
name,
));
self.rust_arguments
.push(format!("isLikeNone({0}) ? 0 : addHeapObject({0})", name,));
} else {
self.rust_arguments.push(format!("addHeapObject({})", name));
}
@ -225,7 +223,8 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
}
self.rust_arguments.push(format!("!isLikeNone({0})", name));
self.rust_arguments.push(format!("isLikeNone({0}) ? 0 : {0}", name));
self.rust_arguments
.push(format!("isLikeNone({0}) ? 0 : {0}", name));
return Ok(self);
}
@ -245,7 +244,8 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
));
}
self.rust_arguments.push(format!("isLikeNone({0}) ? 0xFFFFFF : {0}", name));
self.rust_arguments
.push(format!("isLikeNone({0}) ? 0xFFFFFF : {0}", name));
return Ok(self);
}
@ -278,7 +278,8 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
match *arg {
Descriptor::Boolean => {
self.cx.expose_is_like_none();
self.js_arguments.push((name.clone(), "boolean".to_string()));
self.js_arguments
.push((name.clone(), "boolean".to_string()));
if self.cx.config.debug {
self.cx.expose_assert_bool();
self.prelude(&format!(
@ -290,17 +291,22 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
name,
));
}
self.rust_arguments.push(format!("isLikeNone({0}) ? 0xFFFFFF : {0} ? 1 : 0", name));
self.rust_arguments
.push(format!("isLikeNone({0}) ? 0xFFFFFF : {0} ? 1 : 0", name));
return Ok(self);
},
}
Descriptor::Char => {
self.cx.expose_is_like_none();
self.js_arguments.push((name.clone(), "string".to_string()));
self.rust_arguments.push(format!("!isLikeNone({0})", name));
self.rust_arguments.push(format!("isLikeNone({0}) ? 0 : {0}.codePointAt(0)", name));
self.rust_arguments
.push(format!("isLikeNone({0}) ? 0 : {0}.codePointAt(0)", name));
return Ok(self);
},
_ => bail!("unsupported optional argument type for calling Rust function from JS: {:?}", arg),
}
_ => bail!(
"unsupported optional argument type for calling Rust function from JS: {:?}",
arg
),
};
}
@ -401,7 +407,10 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
self.js_arguments.push((name.clone(), "string".to_string()));
self.rust_arguments.push(format!("{}.codePointAt(0)", name))
}
_ => bail!("unsupported argument type for calling Rust function from JS: {:?}", arg),
_ => bail!(
"unsupported argument type for calling Rust function from JS: {:?}",
arg
),
}
Ok(self)
}
@ -412,14 +421,15 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
Some(class) if class == name => {
self.ret_expr = format!("this.ptr = RET;");
if self.cx.config.weak_refs {
self.ret_expr.push_str(&format!("\
self.ret_expr.push_str(&format!(
"\
addCleanup(this, this.ptr, free{});
", name));
",
name
));
}
}
Some(class) => {
bail!("constructor for `{}` cannot return `{}`", class, name)
}
Some(class) => bail!("constructor for `{}` cannot return `{}`", class, name),
None => {
self.ret_ty = name.to_string();
self.cx.require_class_wrap(name);
@ -465,7 +475,11 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
",
f,
ty.size(),
guard = if optional { "if (rustptr === 0) return;" } else { "" },
guard = if optional {
"if (rustptr === 0) return;"
} else {
""
},
);
return Ok(self);
}
@ -559,7 +573,7 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
return ret === 0xFFFFFF ? undefined : ret !== 0;
".to_string();
return Ok(self);
},
}
Descriptor::Char => {
self.ret_ty = "string".to_string();
self.cx.expose_global_argument_ptr()?;
@ -573,8 +587,11 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
return present === 0 ? undefined : String.fromCodePoint(value);
".to_string();
return Ok(self);
},
_ => bail!("unsupported optional return type for calling Rust function from JS: {:?}", ty),
}
_ => bail!(
"unsupported optional return type for calling Rust function from JS: {:?}",
ty
),
};
}
@ -633,15 +650,20 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
self.ret_ty = "string".to_string();
self.ret_expr = format!("return String.fromCodePoint(RET);")
}
_ => bail!("unsupported return type for calling Rust function from JS: {:?}", ty),
_ => bail!(
"unsupported return type for calling Rust function from JS: {:?}",
ty
),
}
Ok(self)
}
pub fn js_doc_comments(&self) -> String {
let mut ret: String = self.js_arguments.iter().map(|a| {
format!("@param {{{}}} {}\n", a.1, a.0)
}).collect();
let mut ret: String = self
.js_arguments
.iter()
.map(|a| format!("@param {{{}}} {}\n", a.1, a.0))
.collect();
ret.push_str(&format!("@returns {{{}}}", self.ret_ty));
ret
}