Refactor: make `get_crate_name` a method of `CargoManifest`

master
Nick Fitzgerald 7 years ago
parent 0e09b3fd3c
commit 25490301e0
  1. 4
      src/command/build.rs
  2. 10
      src/manifest/mod.rs
  3. 4
      tests/all/manifest.rs

@ -106,7 +106,7 @@ impl Build {
pub fn try_from_opts(build_opts: BuildOptions) -> Result<Self, failure::Error> {
let crate_path = set_crate_path(build_opts.path)?;
let crate_data = manifest::CargoManifest::read(&crate_path)?;
let crate_name = manifest::get_crate_name(&crate_data).to_string();
let crate_name = crate_data.get_crate_name().to_string();
let out_dir = crate_path.join(PathBuf::from(build_opts.out_dir));
// let build_config = manifest::xxx(&crate_path).xxx();
Ok(Build {
@ -300,7 +300,7 @@ impl Build {
info!(&log, "Installing wasm-bindgen-cli was successful.");
info!(&log, "Getting the crate name from the manifest...");
self.crate_name = manifest::get_crate_name(&self.crate_data).to_string();
self.crate_name = self.crate_data.get_crate_name().to_string();
info!(
&log,
"Got crate name {:#?} from the manifest at {:#?}.",

@ -124,6 +124,11 @@ impl CargoManifest {
Ok(())
}
/// Get the crate name for the crate at the given path.
pub fn get_crate_name(&self) -> &str {
&self.package.name
}
fn into_commonjs(mut self, scope: &Option<String>, disable_dts: bool) -> NpmPackage {
let filename = self.package.name.replace("-", "_");
let wasm_file = format!("{}_bg.wasm", filename);
@ -237,11 +242,6 @@ impl CargoManifest {
}
}
/// Get the crate name for the crate at the given path.
pub fn get_crate_name(crate_data: &CargoManifest) -> &str {
&crate_data.package.name
}
/// Check that the crate the given path is properly configured.
pub fn check_crate_config(crate_data: &CargoManifest, step: &Step) -> Result<(), failure::Error> {
let msg = format!("{}Checking crate configuration...", emoji::WRENCH);

@ -9,7 +9,7 @@ use wasm_pack::{self, manifest};
fn it_gets_the_crate_name_default_path() {
let path = &PathBuf::from(".");
let crate_data = manifest::CargoManifest::read(&path).unwrap();
let name = manifest::get_crate_name(&crate_data);
let name = crate_data.get_crate_name();
assert_eq!(name, "wasm-pack");
}
@ -17,7 +17,7 @@ fn it_gets_the_crate_name_default_path() {
fn it_gets_the_crate_name_provided_path() {
let fixture = fixture::js_hello_world();
let crate_data = manifest::CargoManifest::read(&fixture.path).unwrap();
assert_eq!(manifest::get_crate_name(&crate_data), "js-hello-world");
assert_eq!(crate_data.get_crate_name(), "js-hello-world");
}
#[test]

Loading…
Cancel
Save