refactor(crate_type): bring inline with wasm-bindgen check

master
Ashley Williams 7 years ago
parent f063f4cfcc
commit c789b6a522
  1. 19
      src/manifest.rs

@ -160,19 +160,14 @@ pub fn check_wasm_bindgen(path: &str) -> Result<(), Error> {
)) ))
} }
fn has_cdylib(path: &str) -> Result<bool, Error> { pub fn check_crate_type(path: &str) -> Result<(), Error> {
Ok(read_cargo_toml(path)?.lib.map_or(false, |lib| { if read_cargo_toml(path)?.lib.map_or(false, |lib| {
lib.crate_type lib.crate_type
.map_or(false, |types| types.iter().any(|s| s == "cdylib")) .map_or(false, |types| types.iter().any(|s| s == "cdylib"))
})) }) {
} return Ok(());
pub fn check_crate_type(path: &str) -> Result<(), Error> {
if !has_cdylib(path)? {
Error::crate_config(
"crate-type must include cdylib to compile to wasm32-unknown-unknown. Add the following to your Cargo.toml file:\n\n[lib]\ncrate-type = [\"cdylib\"]"
)
} else {
Ok(())
} }
Error::crate_config(
"crate-type must be cdylib to compile to wasm32-unknown-unknown. Add the following to your Cargo.toml file:\n\n[lib]\ncrate-type = [\"cdylib\"]"
)
} }

Loading…
Cancel
Save