Removed unnecessary macro and added comments

master
daubaris 6 years ago
parent e918fddb71
commit b30b72b99a
  1. 22
      src/build.rs
  2. 3
      src/main.rs
  3. 7
      src/manifest/mod.rs

@ -62,26 +62,8 @@ pub fn check_wasm_pack_versions() -> Result<(String, String), Error> {
} }
fn wasm_pack_local_version() -> Option<String> { fn wasm_pack_local_version() -> Option<String> {
macro_rules! otry { let output = env!("CARGO_PKG_VERSION");
($e:expr) => { Some(output.to_string())
match $e {
Some(e) => e,
None => return None,
}
};
}
let output = otry!(Command::new("wasm-pack").arg("--version").output().ok());
let version = otry!(str::from_utf8(&output.stdout).ok());
let mut pieces = version.split(' ');
if pieces.next() != Some("wasm-pack") {
return None;
}
otry!(pieces.next())
.to_string()
.trim()
.parse::<String>()
.ok()
} }
/// Get rustc's sysroot as a PathBuf /// Get rustc's sysroot as a PathBuf

@ -68,7 +68,8 @@ fn run() -> Result<(), failure::Error> {
run_wasm_pack(args.cmd)?; run_wasm_pack(args.cmd)?;
if let Ok(update_available) = update_available.try_recv() { if let Ok(update_available) = update_available.try_recv() {
println!("There's a newer version of wasm-pack available, the new version is: {}, you are using: {}", update_available.1, update_available.0); println!("There's a newer version of wasm-pack available, the new version is: {}, you are using: {}. \
To update, navigate to: https://rustwasm.github.io/wasm-pack/installer/", update_available.1, update_available.0);
} }
Ok(()) Ok(())

@ -162,7 +162,7 @@ impl Crate {
} }
fn return_api_call_result(current_time: DateTime<offset::Local>) -> Option<String> { fn return_api_call_result(current_time: DateTime<offset::Local>) -> Option<String> {
Crate::call_for_wasm_pack_version().and_then(|v| { Crate::return_latest_wasm_pack_version().and_then(|v| {
Crate::override_stamp_file(current_time, &v); Crate::override_stamp_file(current_time, &v);
Some(v) Some(v)
}) })
@ -188,6 +188,7 @@ impl Crate {
} }
} }
/// Return stamp file where metadata is stored.
fn return_wasm_pack_file() -> Option<String> { fn return_wasm_pack_file() -> Option<String> {
if let Ok(path) = which::which("wasm-pack") { if let Ok(path) = which::which("wasm-pack") {
if let Ok(file) = fs::read_to_string(path.with_extension("stamp")) { if let Ok(file) = fs::read_to_string(path.with_extension("stamp")) {
@ -197,13 +198,15 @@ impl Crate {
None None
} }
fn call_for_wasm_pack_version() -> Option<String> { /// Returns wasm-pack latest version (if it's received) by executing check_wasm_pack_latest_version function.
fn return_latest_wasm_pack_version() -> Option<String> {
if let Ok(crt) = Crate::check_wasm_pack_latest_version() { if let Ok(crt) = Crate::check_wasm_pack_latest_version() {
return Some(crt.crt.max_version); return Some(crt.crt.max_version);
} }
None None
} }
/// Read the stamp file and return value assigned to a certain key.
fn return_stamp_file_value(file: &String, word: &str) -> Option<String> { fn return_stamp_file_value(file: &String, word: &str) -> Option<String> {
let created = file let created = file
.lines() .lines()

Loading…
Cancel
Save